From cgrzemba at users.sourceforge.net Tue Apr 1 08:03:57 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 1 Apr 2014 06:03:57 +0000 Subject: SF.net SVN: gar:[23306] csw/mgar/pkg/hplip/trunk Message-ID: <3fyg561V8ZzFH@mail.opencsw.org> Revision: 23306 http://sourceforge.net/p/gar/code/23306 Author: cgrzemba Date: 2014-04-01 06:03:57 +0000 (Tue, 01 Apr 2014) Log Message: ----------- hplip/trunk: add configure options, runtime dependencies Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2014-03-31 18:47:21 UTC (rev 23305) +++ csw/mgar/pkg/hplip/trunk/Makefile 2014-04-01 06:03:57 UTC (rev 23306) @@ -16,11 +16,6 @@ PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc -PACKAGES = CSWhplip -# OBSOLETED_BY_CSWhplip = CSWhpijs -SPKG_DESC_CSWhplip = $(DESCRIPTION) Inkjet driver -RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7 - PATCHFILES += 0001-add-strnlen.patch PATCHFILES += 0002-set-csw-path-hpijs.cpp.patch PATCHFILES += 0004-set-csw-path-foomatic-rip-hplip.patch @@ -31,6 +26,56 @@ PATCHFILES += 0009-add-getdomainname-def-HPCupsFilter.cpp.patch PATCHFILES += 0010-include-math.h.ErnieFilter.cpp.patch +PACKAGES += CSWlibhpip0 +CATALOGNAME_CSWlibhpip0 = libhpip0 +SPKG_DESC_CSWlibhpip0 += $(DESCRIPTION), libhpip +PKGFILES_CSWlibhpip0 += $(call baseisadirs,$(libdir),libhpip\.so\.0\.0\.1) +PKGFILES_CSWlibhpip0 += $(call baseisadirs,$(libdir),libhpip\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibhpip0 += $(DESCRIPTION), libhpip.so.0 +CHECKPKG_OVERRIDES_CSWlibhpip0 += bad-rpath-entry + +PACKAGES += CSWlibhpmud0 +CATALOGNAME_CSWlibhpmud0 = libhpmud0 +SPKG_DESC_CSWlibhpmud0 += $(DESCRIPTION), libhpmud +PKGFILES_CSWlibhpmud0 += $(call baseisadirs,$(libdir),libhpmud\.so\.0\.0\.6) +PKGFILES_CSWlibhpmud0 += $(call baseisadirs,$(libdir),libhpmud\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibhpmud0 += $(DESCRIPTION), libhpmud.so.0 +# need /usr/sfw/lib/libusb.so +CHECKPKG_OVERRIDES_CSWlibhpmud0 += bad-rpath-entry + +PACKAGES += CSWhplip-dev +CATALOGNAME_CSWhplip-dev = hplip_dev +SPKG_DESC_CSWhplip-dev += $(DESCRIPTION), development files +PKGFILES_CSWhplip-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWhplip-dev += CSWlibhpmud0 +RUNTIME_DEP_PKGS_CSWhplip-dev += CSWlibhpip0 + +PACKAGES += CSWhplip +# OBSOLETED_BY_CSWhplip = CSWhpijs +SPKG_DESC_CSWhplip = $(DESCRIPTION) Inkjet driver +RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWhplip += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWhplip += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWhplip += CSWlibsane1 +RUNTIME_DEP_PKGS_CSWhplip += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWhplip += CSWlibhpmud0 +RUNTIME_DEP_PKGS_CSWhplip += CSWlibhpip0 +CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html +CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html +CHECKPKG_OVERRIDES_CSWhplip += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWhplip += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWhplip += catalogname-does-not-start-with-py_ + + +# not interested in dll.conf +EXTRA_MERGE_EXCLUDE_FILES += /etc/sane.d.* +# not interested in 56-hpmud.rules +EXTRA_MERGE_EXCLUDE_FILES += /etc/udev.* +# not interested in systemd stuff +EXTRA_MERGE_EXCLUDE_FILES += /usr/lib.* +# not interested in hal stuff +EXTRA_MERGE_EXCLUDE_FILES += /usr/share.* + EXTRA_LINKER_FLAGS_SOS12U3 += -norunpath -xnorunpath EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GARCOMPILER)) EXTRA_INC += /usr/sfw/include @@ -38,6 +83,7 @@ EXTRA_CPPFLAGS_SOS12U3 += -features=extensions EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS_$(GARCOMPILER)) STRIP_LIBTOOL = 1 +EXTRAC_CONFIGURE_ENV += hplip_confdir=$(sysconfdir)/hp CONFIGURE_ARGS = $(DIRPATHS) # CONFIGURE_ARGS += --enable-hpijs-only-build @@ -49,10 +95,13 @@ # CONFIGURE_ARGS += --disable-gui-build # CONFIGURE_ARGS += --disable-fax-build CONFIGURE_ARGS += --enable-libusb01_build +CONFIGURE_ARGS += --with-systraydir=$(sysconfdir)/xdg/autostart +CONFIGURE_ARGS += --with-icondir=$(datadir)/icons/hp +CONFIGURE_ARGS += --with-mimedir=$(sysconfdir)/cups +CONFIGURE_ARGS += --with-cupsbackenddir=$(libdir)/cups/backend +CONFIGURE_ARGS += --with-cupsfilterdir=$(libdir)/cups/filter +CONFIGURE_ARGS += --with-drvdir=$(libdir)/cups/drv/hp -CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html -CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html - include gar/category.mk post-install: Modified: csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch 2014-03-31 18:47:21 UTC (rev 23305) +++ csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch 2014-04-01 06:03:57 UTC (rev 23306) @@ -9,8 +9,6 @@ @HPLIP_BUILD_TRUE at am_libhpmud_la_rpath = -rpath $(libdir) am__DEPENDENCIES_1 = @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_DEPENDENCIES = \ ---- a/Makefile.in -+++ b/Makefile.in @@ -346,7 +346,7 @@ am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c \ libsane_hpaio_la_OBJECTS = $(am_libsane_hpaio_la_OBJECTS) libsane_hpaio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -20,8 +18,6 @@ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at am_libsane_hpaio_la_rpath = -rpath \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(libsane_hpaiodir) pcardext_la_LIBADD = ---- a/Makefile.in -+++ b/Makefile.in @@ -366,7 +366,7 @@ am__scanext_la_SOURCES_DIST = scan/scanext/scanext.c scanext_la_OBJECTS = $(am_scanext_la_OBJECTS) scanext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -31,3 +27,21 @@ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at am_scanext_la_rpath = \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ -rpath \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(scanextdir) +@@ -4449,7 +4449,7 @@ cups_drv = prnt/drv/hpcups.drv + @HPLIP_BUILD_TRUE at dist_halpre_DATA = data/rules/20-hplip-devices.fdi + + # hplip.conf +- at HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp ++ at HPLIP_BUILD_TRUE@hplip_confdir = /etc/opt/csw/hp + @HPLIP_BUILD_TRUE at hplip_conf_DATA = hplip.conf + + #pstotiff filter +@@ -4457,7 +4457,7 @@ cups_drv = prnt/drv/hpcups.drv + @HPLIP_BUILD_TRUE at pstotiff_SCRIPTS = fax/filters/pstotiff + + # hplip.state +- at HPLIP_BUILD_TRUE@hplip_statedir = /var/lib/hp ++ at HPLIP_BUILD_TRUE@hplip_statedir = /var/opt/csw/lib/hp + @HPLIP_BUILD_TRUE at dist_hplip_state_DATA = + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at cmddir = $(hplipdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Apr 1 08:32:39 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 1 Apr 2014 06:32:39 +0000 Subject: SF.net SVN: gar:[23307] csw/mgar/pkg/hplip/trunk/Makefile Message-ID: <3fyghH30PHzKL@mail.opencsw.org> Revision: 23307 http://sourceforge.net/p/gar/code/23307 Author: cgrzemba Date: 2014-04-01 06:32:38 +0000 (Tue, 01 Apr 2014) Log Message: ----------- hplip/trunk: reinplace for pstotiff Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2014-04-01 06:03:57 UTC (rev 23306) +++ csw/mgar/pkg/hplip/trunk/Makefile 2014-04-01 06:32:38 UTC (rev 23307) @@ -16,6 +16,12 @@ PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc +REINPLACE_USRSHARE += fax/filters/pstotiff +REINPLACEMENTS += usrbin +REINPLACE_MATCH_usrbin = /usr/bin/gs +REINPLACE_WITH_usrbin = /opt/csw/bin/gs +REINPLACE_FILES_usrbin += fax/filters/pstotiff + PATCHFILES += 0001-add-strnlen.patch PATCHFILES += 0002-set-csw-path-hpijs.cpp.patch PATCHFILES += 0004-set-csw-path-foomatic-rip-hplip.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Apr 1 09:38:08 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 1 Apr 2014 07:38:08 +0000 Subject: SF.net SVN: gar:[23308] csw/mgar/pkg/hplip/trunk/Makefile Message-ID: <3fyj7r5HG9zQt@mail.opencsw.org> Revision: 23308 http://sourceforge.net/p/gar/code/23308 Author: cgrzemba Date: 2014-04-01 07:38:07 +0000 (Tue, 01 Apr 2014) Log Message: ----------- hplip/trunk: add dependency ghostscript Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2014-04-01 06:32:38 UTC (rev 23307) +++ csw/mgar/pkg/hplip/trunk/Makefile 2014-04-01 07:38:07 UTC (rev 23308) @@ -66,6 +66,8 @@ RUNTIME_DEP_PKGS_CSWhplip += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWhplip += CSWlibhpmud0 RUNTIME_DEP_PKGS_CSWhplip += CSWlibhpip0 +RUNTIME_DEP_PKGS_CSWhplip += CSWghostscript +CHECKPKG_OVERRIDES_CSWhplip += surplus-dependency|CSWghostscript CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html CHECKPKG_OVERRIDES_CSWhplip += bad-rpath-entry 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 Apr 1 22:51:35 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 1 Apr 2014 20:51:35 +0000 Subject: SF.net SVN: gar:[23309] csw/mgar/pkg/rcs/trunk/Makefile Message-ID: <3fz2lN2fGZz18p@mail.opencsw.org> Revision: 23309 http://sourceforge.net/p/gar/code/23309 Author: dmichelsen Date: 2014-04-01 20:51:33 +0000 (Tue, 01 Apr 2014) Log Message: ----------- rcs/trunk: Enable GCC Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2014-04-01 07:38:07 UTC (rev 23308) +++ csw/mgar/pkg/rcs/trunk/Makefile 2014-04-01 20:51:33 UTC (rev 23309) @@ -11,11 +11,6 @@ VENDOR_URL = http://www.gnu.org/software/rcs/ -# Make extra package for Solaris 11 as the Solaris 10 package dumps core: -# https://www.opencsw.org/mantis/view.php?id=5159 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 - PACKAGES += CSWrcs SPKG_DESC_CSWrcs = GNU Revision Control System # PKGFILES is catchall @@ -26,16 +21,14 @@ DIFF = $(bindir)/gdiff DIFF3 = $(bindir)/gdiff3 -# Every kind of -xO* leads to this strange error in Sun Studio 12 or even 12.3: -# cg error (as) : location counter not on word boundary -OPT_FLAGS_SOS = +# Sun Studio results in strange errors as reported in +# https://www.opencsw.org/mantis/view.php?id=5159 +GARCOMPILER = GNU NORUNPATH = 1 CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --with-diffutils -TEST_TARGET = - BUILD_OVERRIDE_DIRS = DIFF DIFF3 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 Apr 2 15:48:37 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 2 Apr 2014 13:48:37 +0000 Subject: SF.net SVN: gar:[23310] csw/mgar/pkg/lang-python/send_nsca/trunk/Makefile Message-ID: <3fzTK31gV7zWF@mail.opencsw.org> Revision: 23310 http://sourceforge.net/p/gar/code/23310 Author: dmichelsen Date: 2014-04-02 13:48:36 +0000 (Wed, 02 Apr 2014) Log Message: ----------- lang-python/send_nsca/trunk: Adjust location of config file Modified Paths: -------------- csw/mgar/pkg/lang-python/send_nsca/trunk/Makefile Modified: csw/mgar/pkg/lang-python/send_nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/send_nsca/trunk/Makefile 2014-04-01 20:51:33 UTC (rev 23309) +++ csw/mgar/pkg/lang-python/send_nsca/trunk/Makefile 2014-04-02 13:48:36 UTC (rev 23310) @@ -20,4 +20,10 @@ RUNTIME_DEP_PKGS_CSWpy-send-nsca += CSWpy-crypto CHECKPKG_OVERRIDES_CSWpy-send-nsca += surplus-dependency|CSWpy-crypto +REINPLACEMENTS += cfg +REINPLACE_MATCH_cfg = /etc/send_nsca.cfg +REINPLACE_WITH_cfg = $(sysconfdir)/nagios/send_nsca.cfg +REINPLACE_FILES_cfg += bin/py_send_nsca +REINPLACE_FILES_cfg += send_nsca/nsca.py + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 2 16:32:25 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 2 Apr 2014 14:32:25 +0000 Subject: SF.net SVN: gar:[23311] csw/mgar/pkg/389-ds-base/branches/vers1.3.2 Message-ID: <3fzVHf1PCDzcm@mail.opencsw.org> Revision: 23311 http://sourceforge.net/p/gar/code/23311 Author: cgrzemba Date: 2014-04-02 14:32:24 +0000 (Wed, 02 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: fix problems with 64bit and posix-winsync Modified Paths: -------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0014-ldap-include-Makefile.am.patch Added Paths: ----------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0019-void-ptr-conntable.c.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0020-debug-label-main.c.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0021-include-lber.h-slapi-plugin.h.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0022-adjust-mozldap-version-sasl_io.c.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0023-phtread-include-slapi2nspr.c.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0024-strndup.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0025-posix-winsync.rawentry.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-02 13:48:36 UTC (rev 23310) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-02 14:32:24 UTC (rev 23311) @@ -52,16 +52,21 @@ PATCHFILES += 0017-disable-asm-for-Sparc.patch # probably only with openLDAP PATCHFILES += 0018-correct-64bit-ptr-bind.c +PATCHFILES += 0021-include-lber.h-slapi-plugin.h.patch +PATCHFILES += 0022-adjust-mozldap-version-sasl_io.c.patch +PATCHFILES += 0023-phtread-include-slapi2nspr.c.patch +PATCHFILES += 0024-strndup.patch +PATCHFILES += 0025-posix-winsync.rawentry.patch PATCHFILES += $(PATCHFILES_$(GARCOMPILER)) - BUILD_DEP_PKGS += CSWautoconf BUILD_DEP_PKGS += CSWautomake BUILD_DEP_PKGS += CSWbdb48devel BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWlibnss-dev BUILD_DEP_PKGS += CSWnetsnmp-dev -BUILD_DEP_PKGS += CSWopenldap-dev +# BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWmozldap-dev BUILD_DEP_PKGS += CSWsasl-dev BUILD_DEP_PKGS += CSWlibicu-dev BUILD_DEP_PKGS += CSWlibsvrcore0-dev @@ -113,7 +118,7 @@ EXTRA_LIB = /opt/csw/bdb48/lib # if use MozillaLDAP remove -I/opt/csw/include because there are OpenLDAP header -# CPPFLAGS = +CPPFLAGS = EXTRA_CFLAGS_SOS12U3 = -xnorunpath EXTRA_CXXFLAGS_SOS12U3 = -norunpath EXTRA_CPPFLAGS_GCC4 = -DSOLARIS_GCC @@ -125,12 +130,12 @@ GARFLAVOR = DBG CONFIGURE_ARGS = $(DIRPATHS) -# CONFIGURE_ARGS += --with-ldapsdk-inc=$(includedir)/dirsrv -# CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir) -## CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR)) +CONFIGURE_ARGS += --with-ldapsdk-inc=$(includedir)/dirsrv +CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir) +CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR)) # CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir) -CONFIGURE_ARGS += --with-openldap=$(prefix) -CONFIGURE_ARGS += --with-openldap-inc=$(includedir) +# CONFIGURE_ARGS += --with-openldap=$(prefix) +# CONFIGURE_ARGS += --with-openldap-inc=$(includedir) CONFIGURE_ARGS += --with-db-inc=$(prefix)/bdb48/include CONFIGURE_ARGS += --with-db-lib=$(abspath $(prefix)/bdb48/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --with-icu-inc=$(includedir) Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0014-ldap-include-Makefile.am.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0014-ldap-include-Makefile.am.patch 2014-04-02 13:48:36 UTC (rev 23310) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0014-ldap-include-Makefile.am.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -9,3 +9,14 @@ # We need to make sure that libpthread is linked before libc on HP-UX. if HPUX AM_LDFLAGS = -lpthread +--- a/Makefile.am ++++ b/Makefile.am +@@ -1362,7 +1362,7 @@ ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \ + ldap/servers/snmp/ldap-agent.c \ + ldap/servers/slapd/agtmmap.c + +-ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ ++ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @openldap_inc@ @ldapsdk_inc@ @netsnmp_inc@ @nss_inc@ @nspr_inc@ + ldap_agent_bin_LDADD = $(LDAPSDK_LINK_NOTHR) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK) $(THREADLIB) + if SOLARIS + ldap_agent_bin_LDADD += -lrt Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0019-void-ptr-conntable.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0019-void-ptr-conntable.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0019-void-ptr-conntable.c.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,18 @@ +--- a/ldap/servers/slapd/conntable.c ++++ b/ldap/servers/slapd/conntable.c +@@ -50,6 +50,7 @@ connection_table_new(int table_size) + Connection_Table *ct; + int i = 0; + ber_len_t maxbersize = config_get_maxbersize(); ++ LBER_SOCKET invalid_socket; + + ct= (Connection_Table*)slapi_ch_calloc( 1, sizeof(Connection_Table) ); + ct->size= table_size; +@@ -62,7 +63,6 @@ connection_table_new(int table_size) + */ + for ( i = 0; i < table_size; i++ ) + { +- LBER_SOCKET invalid_socket; + /* DBDB---move this out of here once everything works */ + ct->c[i].c_sb = ber_sockbuf_alloc(); + invalid_socket = SLAPD_INVALID_SOCKET; Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0020-debug-label-main.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0020-debug-label-main.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0020-debug-label-main.c.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,14 @@ +--- a/ldap/servers/slapd/main.c ++++ b/ldap/servers/slapd/main.c +@@ -124,6 +124,11 @@ static void cmd_set_shutdown(int); + * global variables + */ + ++#if defined(USE_MOZLDAP) && defined(LDAP_DEBUG) ++int ldap_debug = 1; ++int lber_debug = 1; ++#endif ++ + static int slapd_exemode = SLAPD_EXEMODE_UNKNOWN; + + static int init_cmd_shutdown_detect() Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0021-include-lber.h-slapi-plugin.h.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0021-include-lber.h-slapi-plugin.h.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0021-include-lber.h-slapi-plugin.h.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,17 @@ +--- a/ldap/servers/slapd/slapi-plugin.h ++++ b/ldap/servers/slapd/slapi-plugin.h +@@ -7347,14 +7347,6 @@ char **slapi_str2charray_ext( char *str, char *brkstr, int allow_dups ); + #define LDAP_SASL_EXTERNAL "EXTERNAL" /* TLS/SSL extension */ + #endif + +-#ifndef LBER_SOCKET +-#ifdef LBER_SOCKET_T +-#define LBER_SOCKET LBER_SOCKET_T +-#else +-#define LBER_SOCKET int +-#endif +-#endif +- + /* Used to make unhashed passwords available to plugins. */ + #define PSEUDO_ATTR_UNHASHEDUSERPASSWORD "unhashed#user#password" + Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0022-adjust-mozldap-version-sasl_io.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0022-adjust-mozldap-version-sasl_io.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0022-adjust-mozldap-version-sasl_io.c.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,11 @@ +--- a/ldap/servers/slapd/sasl_io.c ++++ b/ldap/servers/slapd/sasl_io.c +@@ -47,7 +47,7 @@ + #include + #ifndef USE_OPENLDAP + #include "mozldap.h" +-#if LDAP_VENDOR_VERSION > 604 ++#if LDAP_VENDOR_VERSION > 607 + /* garbage to cause build to fail */ + MOZLDAP is newer than expected, if the ber structure has not changed + (see ldap/server/slapd/mozldap.h), please bump the version number(604 -> new version) Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0023-phtread-include-slapi2nspr.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0023-phtread-include-slapi2nspr.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0023-phtread-include-slapi2nspr.c.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,13 @@ +--- a/ldap/servers/slapd/slapi2nspr.c ++++ b/ldap/servers/slapd/slapi2nspr.c +@@ -60,7 +60,9 @@ + * directly to their NSPR equivalents. Clever, huh? + */ + +- ++#ifdef USE_POSIX_RWLOCKS ++#include ++#endif + /* + * ---------------- SLAPI API Functions -------------------------------------- + */ Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0024-strndup.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0024-strndup.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0024-strndup.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,27 @@ +--- a/ldap/servers/plugins/automember/automember.c ++++ b/ldap/servers/plugins/automember/automember.c +@@ -44,7 +44,10 @@ + */ + #include "automember.h" + +- ++#include "plstr.h" ++#ifndef strndup ++#define strndup PL_strndup ++#endif + /* + * Plug-in globals + */ +--- a/ldap/servers/plugins/mep/mep.c ++++ b/ldap/servers/plugins/mep/mep.c +@@ -39,6 +39,10 @@ + # include + #endif + ++#include "plstr.h" ++#ifndef strndup ++#define strndup PL_strndup ++#endif + /* + * Managed Entries Plug-in + */ Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0025-posix-winsync.rawentry.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0025-posix-winsync.rawentry.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0025-posix-winsync.rawentry.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,173 @@ +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -372,23 +372,38 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */ + return; + } + +-/* Returns non-zero if the attribute value sets are identical. */ ++ + static int + attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b) + { +- int i = 0; +- Slapi_Value *va = NULL; +- +- /* Iterate through values in attr a and search for each in attr b */ +- for (i = slapi_attr_first_value(a, &va); va && (i != -1); i = slapi_attr_next_value(a, i, &va)) { +- +- /* Compare the entire attribute value */ +- if (slapi_attr_value_find(b, slapi_value_get_berval(va)) != 0) { +- return 0; ++ /* For now only handle single values */ ++ Slapi_Value *va = NULL; ++ Slapi_Value *vb = NULL; ++ int num_a = 0; ++ int num_b = 0; ++ int match = 1; ++ ++ slapi_attr_get_numvalues(a,&num_a); ++ slapi_attr_get_numvalues(b,&num_b); ++ ++ if (num_a == num_b) { ++ slapi_attr_first_value(a, &va); ++ slapi_attr_first_value(b, &vb); ++ ++ /* If either val is less than n, then check if the length, then values are ++ * equal. If both are n or greater, then only compare the first n chars. ++ * If n is 0, then just compare the entire attribute. */ ++ if (va->bv.bv_len == vb->bv.bv_len) { ++ if (slapi_attr_value_find(b, slapi_value_get_berval(va)) != 0) { ++ match = 0; ++ } ++ } else { ++ match = 0; + } +- } +- return 1; +-} ++ } else { ++ match = 0; ++ } ++ return match;} + + /* look in the parent nodes of ds_entry for nis domain entry */ + char * +@@ -777,10 +792,10 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "--> _pre_ds_mod_user_cb -- begin\n"); + +- if ((NULL == rawentry) || (NULL == ad_entry) || (NULL == ds_entry)) { ++ if ((NULL == ad_entry) || (NULL == ds_entry)) { + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "<-- _pre_ds_mod_user_cb -- Empty %s entry.\n", +- (NULL==rawentry)?"rawentry":(NULL==ad_entry)?"ad entry":"ds entry"); ++ (NULL==ad_entry)?"ad entry":"ds entry"); + return; + } + +@@ -898,7 +913,7 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + } + slapi_value_free(&voc); + } +- sync_acct_disable(cbdata, rawentry, ds_entry, ACCT_DISABLE_TO_DS, NULL, smods, do_modify); ++ sync_acct_disable(cbdata, ad_entry, ds_entry, ACCT_DISABLE_TO_DS, NULL, smods, do_modify); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "<-- _pre_ds_mod_user_cb %s %s\n", + slapi_sdn_get_dn(slapi_entry_get_sdn_const(ds_entry)), (do_modify) ? "modified" + : "not modified"); +@@ -944,14 +959,16 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + Slapi_Attr *local_attr = NULL; + char *local_type = NULL; + +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "1.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- found AD attr %s\n", type); + slapi_attr_get_valueset(attr, &vs); + local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); + slapi_entry_attr_find(ds_entry, local_type, &local_attr); + is_present_local = (NULL == local_attr) ? 0 : 1; + if (is_present_local) { + int values_equal = 0; +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "2.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- compare with DS attr %s\n", local_type); + values_equal = attr_compare_equal(attr, local_attr); + if (!values_equal) { + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +@@ -964,13 +981,13 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + *do_modify = 1; + } + } else { +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "3.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- add attr\n"); + + slapi_mods_add_mod_values(smods, LDAP_MOD_ADD, local_type, + valueset_get_valuearray(vs)); + *do_modify = do_modify_local = 1; + } +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "4.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- values compared\n"); + + slapi_ch_free((void**) &local_type); + slapi_valueset_free(vs); +@@ -1109,7 +1126,7 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + } + } + } +- sync_acct_disable(cbdata, rawentry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); ++ sync_acct_disable(cbdata, ad_entry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "<-- _pre_ds_add_user_cb -- end\n"); + + return; +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -68,6 +68,7 @@ + #include + #include "posix-wsp-ident.h" + #include "posix-group-func.h" ++#include "slap.h" + + #define MEMBEROFTASK "memberuid task" + Slapi_Value ** +@@ -136,7 +137,7 @@ enum + * -1 - some sort of error + */ + static int +-check_account_lock(Slapi_Entry *ds_entry, int *isvirt) ++_check_account_lock(Slapi_Entry *ds_entry, int *isvirt) + { + int rc = 1; + Slapi_ValueSet *values = NULL; +@@ -155,7 +156,7 @@ check_account_lock(Slapi_Entry *ds_entry, int *isvirt) + } + slapi_ch_free_string(&strval); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +- "<-- check_account_lock - entry [%s] has real " ++ "<-- _check_account_lock - entry [%s] has real " + "attribute nsAccountLock and entry %s locked\n", + slapi_entry_get_dn_const(ds_entry), rc ? "is not" : "is"); + return rc; +@@ -182,13 +183,13 @@ check_account_lock(Slapi_Entry *ds_entry, int *isvirt) + slapi_vattr_values_free(&values, &actual_type_name, attr_free_flags); + } + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +- "<-- check_account_lock - entry [%s] has virtual " ++ "<-- _check_account_lock - entry [%s] has virtual " + "attribute nsAccountLock and entry %s locked\n", + slapi_entry_get_dn_const(ds_entry), rc ? "is not" : "is"); + } else { + rc = 1; /* no attr == entry is enabled */ + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +- "<-- check_account_lock - entry [%s] does not " ++ "<-- _check_account_lock - entry [%s] does not " + "have attribute nsAccountLock - entry is not locked\n", + slapi_entry_get_dn_const(ds_entry)); + } +@@ -225,7 +226,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */ + int isvirt = 0; + + /* get the account lock state of the ds entry */ +- if (0 == check_account_lock(ds_entry, &isvirt)) { ++ if (0 == _check_account_lock(ds_entry, &isvirt)) { + ds_is_enabled = 0; + } + if (isvirt) Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch 2014-04-02 14:32:24 UTC (rev 23311) @@ -0,0 +1,62 @@ +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -373,8 +373,12 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */ + } + + /* Returns non-zero if the attribute value sets are identical. */ ++/* reuse it from windwos_protocol_util.c */ + static int +-attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b) ++attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b, int n); ++ ++static int ++pw_attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b) + { + int i = 0; + Slapi_Value *va = NULL; +@@ -944,15 +948,17 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + Slapi_Attr *local_attr = NULL; + char *local_type = NULL; + +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "1.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- found AD attr %s\n", type); + slapi_attr_get_valueset(attr, &vs); + local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); + slapi_entry_attr_find(ds_entry, local_type, &local_attr); + is_present_local = (NULL == local_attr) ? 0 : 1; + if (is_present_local) { + int values_equal = 0; +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "2.\n"); +- values_equal = attr_compare_equal(attr, local_attr); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- compare with DS attr %s\n", local_type); ++ values_equal = attr_compare_equal(attr, local_attr, 0); + if (!values_equal) { + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "_pre_ds_mod_group_cb -- update mods: %s, %s : values are different -> modify\n", +@@ -964,13 +970,13 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + *do_modify = 1; + } + } else { +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "3.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- add attr\n"); + + slapi_mods_add_mod_values(smods, LDAP_MOD_ADD, local_type, + valueset_get_valuearray(vs)); + *do_modify = do_modify_local = 1; + } +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "4.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- values compared\n"); + + slapi_ch_free((void**) &local_type); + slapi_valueset_free(vs); +@@ -1109,7 +1115,7 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + } + } + } +- sync_acct_disable(cbdata, rawentry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); ++ sync_acct_disable(cbdata, ad_entry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "<-- _pre_ds_add_user_cb -- end\n"); + + return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 2 16:33:13 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 2 Apr 2014 14:33:13 +0000 Subject: SF.net SVN: gar:[23312] csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/ 0026-fix-check-memberuid-posix-winsync.c.patch Message-ID: <3fzVJL3zSdzh7@mail.opencsw.org> Revision: 23312 http://sourceforge.net/p/gar/code/23312 Author: cgrzemba Date: 2014-04-02 14:33:12 +0000 (Wed, 02 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: delete obsolete patch Removed Paths: ------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch Deleted: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch 2014-04-02 14:32:24 UTC (rev 23311) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-fix-check-memberuid-posix-winsync.c.patch 2014-04-02 14:33:12 UTC (rev 23312) @@ -1,62 +0,0 @@ ---- a/ldap/servers/plugins/posix-winsync/posix-winsync.c -+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c -@@ -373,8 +373,12 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */ - } - - /* Returns non-zero if the attribute value sets are identical. */ -+/* reuse it from windwos_protocol_util.c */ - static int --attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b) -+attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b, int n); -+ -+static int -+pw_attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b) - { - int i = 0; - Slapi_Value *va = NULL; -@@ -944,15 +948,17 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla - Slapi_Attr *local_attr = NULL; - char *local_type = NULL; - -- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "1.\n"); -+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, -+ "_pre_ds_mod_group_cb -- found AD attr %s\n", type); - slapi_attr_get_valueset(attr, &vs); - local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); - slapi_entry_attr_find(ds_entry, local_type, &local_attr); - is_present_local = (NULL == local_attr) ? 0 : 1; - if (is_present_local) { - int values_equal = 0; -- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "2.\n"); -- values_equal = attr_compare_equal(attr, local_attr); -+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, -+ "_pre_ds_mod_group_cb -- compare with DS attr %s\n", local_type); -+ values_equal = attr_compare_equal(attr, local_attr, 0); - if (!values_equal) { - slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, - "_pre_ds_mod_group_cb -- update mods: %s, %s : values are different -> modify\n", -@@ -964,13 +970,13 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla - *do_modify = 1; - } - } else { -- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "3.\n"); -+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- add attr\n"); - - slapi_mods_add_mod_values(smods, LDAP_MOD_ADD, local_type, - valueset_get_valuearray(vs)); - *do_modify = do_modify_local = 1; - } -- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "4.\n"); -+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- values compared\n"); - - slapi_ch_free((void**) &local_type); - slapi_valueset_free(vs); -@@ -1109,7 +1115,7 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap - } - } - } -- sync_acct_disable(cbdata, rawentry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); -+ sync_acct_disable(cbdata, ad_entry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); - slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "<-- _pre_ds_add_user_cb -- end\n"); - - return; 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 Apr 2 17:11:36 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 2 Apr 2014 15:11:36 +0000 Subject: SF.net SVN: gar:[23313] csw/mgar/pkg/privoxy/trunk Message-ID: <3fzW8f5zKdzyp@mail.opencsw.org> Revision: 23313 http://sourceforge.net/p/gar/code/23313 Author: dmichelsen Date: 2014-04-02 15:11:35 +0000 (Wed, 02 Apr 2014) Log Message: ----------- privoxy/trunk: Update to 3.0.21 and latest standards Modified Paths: -------------- csw/mgar/pkg/privoxy/trunk/Makefile csw/mgar/pkg/privoxy/trunk/checksums Modified: csw/mgar/pkg/privoxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/privoxy/trunk/Makefile 2014-04-02 14:33:12 UTC (rev 23312) +++ csw/mgar/pkg/privoxy/trunk/Makefile 2014-04-02 15:11:35 UTC (rev 23313) @@ -4,7 +4,7 @@ # least) log rotation. # NAME = privoxy -VERSION = 3.0.12 +VERSION = 3.0.21 GARTYPE = v2 DESCRIPTION = A web proxy with advanced filtering capabilities @@ -19,52 +19,56 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = ijbswa -DISTFILES = $(NAME)-$(VERSION)-stable-src.tar.gz DISTNAME = $(NAME)-$(VERSION)-stable +DISTFILES += $(DISTNAME)-src.tar.gz +DISTFILES += cswprivoxy +DISTFILES += cswusergroup -SPKG_SOURCEURL = http://www.privoxy.org/ -SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf +VENDOR_URL = http://www.privoxy.org/ +RUNTIME_DEP_PKGS_CSWprivoxy += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWprivoxy += CSWlibpcreposix0 +RUNTIME_DEP_PKGS_CSWprivoxy += CSWlibz1 -RUNTIME_DEP_PKGS = CSWclassutils CSWpcrert CSWzlib +sysconfdir = /etc$(prefix)/privoxy -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-stable-src.tar.gz +INITSMF += /etc/opt/csw/init.d/cswprivoxy +USERGROUP += /opt/csw/etc/pkg/CSWprivoxy/cswusergroup +CONFFILES += config +CONFFILES += user.action +CONFFILES += user.filter +PRESERVECONF += $(addprefix $(sysconfdir)/,$(CONFFILES)) + +# This is just an example +CHECKPKG_OVERRIDES_CSWprivoxy += file-with-bad-content|/usr/share|root/etc/opt/csw/privoxy/config.CSW + +# There is no testsuite TEST_SCRIPTS = -sysconfdir = /opt/csw/etc/privoxy -localstatedir = /var/opt/csw/privoxy - CONFIGURE_ARGS = $(DIRPATHS) # Supress sub directories for logs and pid file -INSTALL_ARGS = LOGS_DEST=$(localstatedir) PIDS_DEST=$(localstatedir) +INSTALL_ARGS += LOGS_DEST=$(localstatedir) +INSTALL_ARGS += PIDS_DEST=$(localstatedir) -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /\/init.d\/cswprivoxy$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ - $$$$3 ~ /.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' - include gar/category.mk pre-configure-modulated: - @perl -pi -e 's|-Wall||' $(WORKSRC)/GNUmakefile.in - @cd $(WORKSRC) && autoheader && autoconf + perl -pi -e 's|-Wall||' $(WORKSRC)/GNUmakefile.in + cd $(WORKSRC) && autoheader && autoconf @$(MAKECOOKIE) -post-install-modulated: CONFFILES := config user.action user.filter post-install-modulated: @echo --- Installing cswusergroup file --- - @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/ - @cp $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/ + ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/ + cp $(WORKDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/ @echo --- Installing cpsampleconf config files --- $(foreach C,$(CONFFILES), \ mv $(DESTDIR)$(sysconfdir)/$(C) $(DESTDIR)$(sysconfdir)/$(C).CSW; ) @echo --- Installing cswinitsmf file --- - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @cp $(FILEDIR)/cswprivoxy $(DESTDIR)/etc/opt/csw/init.d/ + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + cp $(WORKDIR)/cswprivoxy $(DESTDIR)/etc/opt/csw/init.d/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/privoxy/trunk/checksums =================================================================== --- csw/mgar/pkg/privoxy/trunk/checksums 2014-04-02 14:33:12 UTC (rev 23312) +++ csw/mgar/pkg/privoxy/trunk/checksums 2014-04-02 15:11:35 UTC (rev 23313) @@ -1 +1 @@ -c973e608d27b248ef567b47664308da1 download/privoxy-3.0.12-stable-src.tar.gz +79558f2545cfcf9731f7de611646d837 privoxy-3.0.21-stable-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 2 17:21:05 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 2 Apr 2014 15:21:05 +0000 Subject: SF.net SVN: gar:[23314] csw/mgar/pkg/rcs/trunk Message-ID: <3fzWMZ6YjWz1RC@mail.opencsw.org> Revision: 23314 http://sourceforge.net/p/gar/code/23314 Author: dmichelsen Date: 2014-04-02 15:21:04 +0000 (Wed, 02 Apr 2014) Log Message: ----------- rcs/trunk: Make the testsuite work by setting PATH correctly Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/rcs/trunk/ Index: csw/mgar/pkg/rcs/trunk =================================================================== --- csw/mgar/pkg/rcs/trunk 2014-04-02 15:11:35 UTC (rev 23313) +++ csw/mgar/pkg/rcs/trunk 2014-04-02 15:21:04 UTC (rev 23314) Property changes on: csw/mgar/pkg/rcs/trunk ___________________________________________________________________ Modified: svn:ignore ## -1,4 +1 ## -cookies -download work - Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2014-04-02 15:11:35 UTC (rev 23313) +++ csw/mgar/pkg/rcs/trunk/Makefile 2014-04-02 15:21:04 UTC (rev 23314) @@ -31,4 +31,8 @@ BUILD_OVERRIDE_DIRS = DIFF DIFF3 +# 'diff -u' is expected to be GNU +# We need 'id' to take -u, hence /usr/xpg4/bin +TEST_ENV_PATH = /opt/csw/gnu:/usr/xpg4/bin:$(PATH) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Apr 3 01:06:34 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 2 Apr 2014 23:06:34 +0000 Subject: SF.net SVN: gar:[23315] csw/mgar/pkg/gxmessage/trunk/Makefile Message-ID: <3fzjhh0Btfzhl@mail.opencsw.org> Revision: 23315 http://sourceforge.net/p/gar/code/23315 Author: wahwah Date: 2014-04-02 23:06:30 +0000 (Wed, 02 Apr 2014) Log Message: ----------- gxmessage/trunk: Updated dependencies Modified Paths: -------------- csw/mgar/pkg/gxmessage/trunk/Makefile Modified: csw/mgar/pkg/gxmessage/trunk/Makefile =================================================================== --- csw/mgar/pkg/gxmessage/trunk/Makefile 2014-04-02 15:21:04 UTC (rev 23314) +++ csw/mgar/pkg/gxmessage/trunk/Makefile 2014-04-02 23:06:30 UTC (rev 23315) @@ -6,29 +6,28 @@ VERSION = 2.12.4 CATEGORIES = gnome GARTYPE = v2 -DESCRIPTION = An xmessage clone for GTK based desktops -define BLURB -endef -SPKG_SOURCEURL = http://homepages.ihug.co.nz/~trmusson/programs.html +DESCRIPTION = Clone of xmessage for GTK based desktops + +VENDOR_URL = http://homepages.ihug.co.nz/~trmusson/programs.html MASTER_SITES = http://homepages.ihug.co.nz/~trmusson/stuff/ MASTER_SITES += http://ftp.gnu.org/pub/gnu/gxmessage/ DISTFILES = $(NAME)-$(VERSION).tar.gz + EXTRA_INC = $(prefix)/include/gtk-2.0 CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWgxmessage += CSWfconfig -RUNTIME_DEP_PKGS_CSWgxmessage += CSWftype2 -RUNTIME_DEP_PKGS_CSWgxmessage += CSWglib2 -RUNTIME_DEP_PKGS_CSWgxmessage += CSWgtk2 -RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibatk -RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgxmessage += CSWpango +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibpango1-0-0 PATCHFILES += 0001-removing-a-usr-local-reference.patch include gar/category.mk post-install-modulated: ln -s gxmessage $(DESTDIR)$(bindir)/gmessage - ln -s gxmessage $(DESTDIR)$(bindir)/xmessage + ln -s ../bin/gxmessage $(DESTDIR)$(prefix)/gnu/xmessage @$(MAKECOOKIE) # Otherwise it keeps finding /usr/bin/xgettext and failing. 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 Apr 3 01:10:26 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 2 Apr 2014 23:10:26 +0000 Subject: SF.net SVN: gar:[23316] csw/mgar/pkg/gxmessage/trunk/Makefile Message-ID: <3fzjn81YD7zmH@mail.opencsw.org> Revision: 23316 http://sourceforge.net/p/gar/code/23316 Author: wahwah Date: 2014-04-02 23:10:24 +0000 (Wed, 02 Apr 2014) Log Message: ----------- gxmessage/trunk: Add missing install (directory is needed before a symlink can be created) Modified Paths: -------------- csw/mgar/pkg/gxmessage/trunk/Makefile Modified: csw/mgar/pkg/gxmessage/trunk/Makefile =================================================================== --- csw/mgar/pkg/gxmessage/trunk/Makefile 2014-04-02 23:06:30 UTC (rev 23315) +++ csw/mgar/pkg/gxmessage/trunk/Makefile 2014-04-02 23:10:24 UTC (rev 23316) @@ -26,8 +26,9 @@ include gar/category.mk post-install-modulated: - ln -s gxmessage $(DESTDIR)$(bindir)/gmessage - ln -s ../bin/gxmessage $(DESTDIR)$(prefix)/gnu/xmessage + ln -sf gxmessage $(DESTDIR)$(bindir)/gmessage + install -d -m 755 $(DESTDIR)$(prefix)/gnu + ln -sf ../bin/gxmessage $(DESTDIR)$(prefix)/gnu/xmessage @$(MAKECOOKIE) # Otherwise it keeps finding /usr/bin/xgettext and failing. 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 Apr 3 01:24:41 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 2 Apr 2014 23:24:41 +0000 Subject: SF.net SVN: gar:[23317] csw/mgar/pkg/gxmessage/trunk/Makefile Message-ID: <3fzk5Y27nwzr2@mail.opencsw.org> Revision: 23317 http://sourceforge.net/p/gar/code/23317 Author: wahwah Date: 2014-04-02 23:24:40 +0000 (Wed, 02 Apr 2014) Log Message: ----------- gxmessage/trunk: CSWlibfreetype6 linked in only on SPARC for some reason (not investigated) Modified Paths: -------------- csw/mgar/pkg/gxmessage/trunk/Makefile Modified: csw/mgar/pkg/gxmessage/trunk/Makefile =================================================================== --- csw/mgar/pkg/gxmessage/trunk/Makefile 2014-04-02 23:10:24 UTC (rev 23316) +++ csw/mgar/pkg/gxmessage/trunk/Makefile 2014-04-02 23:24:40 UTC (rev 23317) @@ -15,7 +15,8 @@ EXTRA_INC = $(prefix)/include/gtk-2.0 CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgxmessage_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgxmessage += $(RUNTIME_DEP_PKGS_CSWgxmessage_$(GARCH)) RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibgobject2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Apr 3 02:02:10 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 3 Apr 2014 00:02:10 +0000 Subject: SF.net SVN: gar:[23318] csw/mgar/pkg/gpgme/trunk/Makefile Message-ID: <3fzkwn6NDzzwR@mail.opencsw.org> Revision: 23318 http://sourceforge.net/p/gar/code/23318 Author: wahwah Date: 2014-04-03 00:02:04 +0000 (Thu, 03 Apr 2014) Log Message: ----------- gpgme/trunk: Obsolete the gpgme package, it was almost empty, content moved to *-dev Modified Paths: -------------- csw/mgar/pkg/gpgme/trunk/Makefile Modified: csw/mgar/pkg/gpgme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gpgme/trunk/Makefile 2014-04-02 23:24:40 UTC (rev 23317) +++ csw/mgar/pkg/gpgme/trunk/Makefile 2014-04-03 00:02:04 UTC (rev 23318) @@ -26,13 +26,8 @@ BUILD_DEP_PKGS += CSWlibgpg-error-dev BUILD_DEP_PKGS += CSWgnupg2 -PACKAGES += CSWgpgme -CATALOGNAME_CSWgpgme = gpgme -SPKG_DESC_CSWgpgme += $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgpgme += CSWlibgpgme-pthread11 -RUNTIME_DEP_PKGS_CSWgpgme += CSWlibgpgme11 -CHECKPKG_OVERRIDES_CSWgpgme += surplus-dependency|CSWlibgpgme-pthread11 -CHECKPKG_OVERRIDES_CSWgpgme += surplus-dependency|CSWlibgpgme11 +OBSOLETED_BY_CSWlibgpgme11 = CSWgpgme +OBSOLETED_BY_CSWlibgpgme-pthread11 = CSWgpgme PACKAGES += CSWlibgpgme-pthread11 CATALOGNAME_CSWlibgpgme-pthread11 = libgpgme_pthread11 @@ -55,7 +50,6 @@ PACKAGES += CSWgpgme-dev CATALOGNAME_CSWgpgme-dev = gpgme_dev SPKG_DESC_CSWgpgme-dev += $(DESCRIPTION), development files -PKGFILES_CSWgpgme-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWgpgme-dev += CSWlibgpgme11 RUNTIME_DEP_PKGS_CSWgpgme-dev += CSWlibgpgme-pthread11 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 Apr 3 11:37:02 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 3 Apr 2014 09:37:02 +0000 Subject: SF.net SVN: gar:[23319] csw/mgar/pkg Message-ID: <3fzzhB3Z76z2m@mail.opencsw.org> Revision: 23319 http://sourceforge.net/p/gar/code/23319 Author: dmichelsen Date: 2014-04-03 09:37:01 +0000 (Thu, 03 Apr 2014) Log Message: ----------- filebench/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/filebench/ csw/mgar/pkg/filebench/Makefile csw/mgar/pkg/filebench/branches/ csw/mgar/pkg/filebench/tags/ csw/mgar/pkg/filebench/trunk/ csw/mgar/pkg/filebench/trunk/Makefile csw/mgar/pkg/filebench/trunk/checksums csw/mgar/pkg/filebench/trunk/files/ csw/mgar/pkg/filebench/trunk/files/0001-dofile-must-not-be-static-as-it-is-used-as-extern-so.patch Added: csw/mgar/pkg/filebench/Makefile =================================================================== --- csw/mgar/pkg/filebench/Makefile (rev 0) +++ csw/mgar/pkg/filebench/Makefile 2014-04-03 09:37:01 UTC (rev 23319) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/filebench/trunk =================================================================== --- csw/mgar/pkg/filebench/trunk 2014-04-03 00:02:04 UTC (rev 23318) +++ csw/mgar/pkg/filebench/trunk 2014-04-03 09:37:01 UTC (rev 23319) Property changes on: csw/mgar/pkg/filebench/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/filebench/trunk/Makefile =================================================================== --- csw/mgar/pkg/filebench/trunk/Makefile (rev 0) +++ csw/mgar/pkg/filebench/trunk/Makefile 2014-04-03 09:37:01 UTC (rev 23319) @@ -0,0 +1,18 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = filebench +VERSION = 1.4.9.1 +GARTYPE = v2 + +DESCRIPTION = A file system and storage benchmark + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-dofile-must-not-be-static-as-it-is-used-as-extern-so.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/filebench/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/filebench/trunk/checksums =================================================================== --- csw/mgar/pkg/filebench/trunk/checksums (rev 0) +++ csw/mgar/pkg/filebench/trunk/checksums 2014-04-03 09:37:01 UTC (rev 23319) @@ -0,0 +1 @@ +e30a4feb78ce5e8224c7ec15fd337e42 filebench-1.4.9.1.tar.gz Added: csw/mgar/pkg/filebench/trunk/files/0001-dofile-must-not-be-static-as-it-is-used-as-extern-so.patch =================================================================== --- csw/mgar/pkg/filebench/trunk/files/0001-dofile-must-not-be-static-as-it-is-used-as-extern-so.patch (rev 0) +++ csw/mgar/pkg/filebench/trunk/files/0001-dofile-must-not-be-static-as-it-is-used-as-extern-so.patch 2014-04-03 09:37:01 UTC (rev 23319) @@ -0,0 +1,26 @@ +From e5e112029773ecd6e43b520623ef2ac291b988c5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 3 Apr 2014 11:30:41 +0200 +Subject: [PATCH] dofile must not be static as it is used as extern somewhere + else + +--- + parser_gram.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/parser_gram.c b/parser_gram.c +index 5359e65..88b7554 100644 +--- a/parser_gram.c ++++ b/parser_gram.c +@@ -114,7 +114,7 @@ static GetLine *gl; + /* executable name to execute worker processes later */ + char *execname; + +-static int dofile = DOFILE_FALSE; ++int dofile = DOFILE_FALSE; + static FILE *parentscript; + + static char *fbbasepath = FILEBENCHDIR; +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Apr 3 19:33:31 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 3 Apr 2014 17:33:31 +0000 Subject: SF.net SVN: gar:[23320] csw/mgar/pkg/torsocks/trunk Message-ID: <3g0BG55M7Bzln@mail.opencsw.org> Revision: 23320 http://sourceforge.net/p/gar/code/23320 Author: jake_goerzen Date: 2014-04-03 17:33:28 +0000 (Thu, 03 Apr 2014) Log Message: ----------- torsocks: add patch torsocks-HEAD-2034625.nww.solaris.patch Modified Paths: -------------- csw/mgar/pkg/torsocks/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/torsocks/trunk/files/torsocks-HEAD-2034625.nww.solaris.patch Modified: csw/mgar/pkg/torsocks/trunk/Makefile =================================================================== --- csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-03 09:37:01 UTC (rev 23319) +++ csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-03 17:33:28 UTC (rev 23320) @@ -5,7 +5,7 @@ VERSION = 1.2 GARTYPE = v2 -DESCRIPTION = use SOCKS-friendly applications with Tor +DESCRIPTION = Use SOCKS-friendly applications with Tor define BLURB Torsocks allows you to use most SOCKS-friendly applications in a safe way with Tor. It ensures that DNS requests are handled safely and explicitly rejects UDP traffic from the application you're using. endef @@ -13,6 +13,8 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES = torsocks-HEAD-2034625.nww.solaris.patch + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Added: csw/mgar/pkg/torsocks/trunk/files/torsocks-HEAD-2034625.nww.solaris.patch =================================================================== --- csw/mgar/pkg/torsocks/trunk/files/torsocks-HEAD-2034625.nww.solaris.patch (rev 0) +++ csw/mgar/pkg/torsocks/trunk/files/torsocks-HEAD-2034625.nww.solaris.patch 2014-04-03 17:33:28 UTC (rev 23320) @@ -0,0 +1,75 @@ +diff -u -r torsocks-HEAD-2034625.orig/configure torsocks-HEAD-2034625/configure +--- torsocks-HEAD-2034625.orig/configure 2013-02-08 15:06:29.754054200 +0100 ++++ torsocks-HEAD-2034625/configure 2013-02-08 15:05:00.720451700 +0100 +@@ -7507,10 +7507,12 @@ + PROTO2='int __fd, const struct sockaddr_in * __name, socklen_t *__namelen' + PROTO3='int __fd, struct sockaddr * __name, socklen_t *__namelen' + PROTO4='int __fd, const struct sockaddr * __name, socklen_t *__namelen' ++PROTO5='int __fd, struct sockaddr * __name, Psocklen_t __namelen' + for testproto in "${PROTO1}" \ + "${PROTO2}" \ + "${PROTO3}" \ +- "${PROTO4}" ++ "${PROTO4}" \ ++ "${PROTO5}" + do + if test "${PROTO}" = ""; then + cat >conftest.$ac_ext <<_ACEOF +diff -u -r torsocks-HEAD-2034625.orig/configure.in torsocks-HEAD-2034625/configure.in +--- torsocks-HEAD-2034625.orig/configure.in 2013-01-28 15:55:50.000000000 +0100 ++++ torsocks-HEAD-2034625/configure.in 2013-02-08 14:14:32.442589900 +0100 +@@ -460,10 +460,12 @@ + PROTO2='int __fd, const struct sockaddr_in * __name, socklen_t *__namelen' + PROTO3='int __fd, struct sockaddr * __name, socklen_t *__namelen' + PROTO4='int __fd, const struct sockaddr * __name, socklen_t *__namelen' ++PROTO5='int __fd, struct sockaddr * __name, Psocklen_t __namelen' + for testproto in "${PROTO1}" \ + "${PROTO2}" \ + "${PROTO3}" \ +- "${PROTO4}" ++ "${PROTO4}" \ ++ "${PROTO5}" + do + if test "${PROTO}" = ""; then + AC_TRY_COMPILE([ +diff -u -r torsocks-HEAD-2034625.orig/test/test_torsocks.c torsocks-HEAD-2034625/test/test_torsocks.c +--- torsocks-HEAD-2034625.orig/test/test_torsocks.c 2013-01-28 15:55:50.000000000 +0100 ++++ torsocks-HEAD-2034625/test/test_torsocks.c 2013-02-08 14:53:59.478363600 +0100 +@@ -40,6 +40,8 @@ + #if defined(__APPLE__) || defined(__darwin__) + #include + #endif ++#include ++#include + #include + #include + #include +@@ -83,7 +85,7 @@ + char datagram[400]; + struct sockaddr_in dest; + struct ip *iphdr=(struct ip *) datagram; +-#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) ++#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) || defined(SOLARIS) + struct icmp *icmphdr=(struct icmp *)(iphdr +1); + #else + struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); +@@ -115,7 +117,7 @@ + iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; + iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); + +-#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) ++#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) || defined(SOLARIS) + icmphdr->icmp_type=130; + icmphdr->icmp_code=0; + icmphdr->icmp_cksum=htons(0xc3b0); +@@ -340,8 +342,10 @@ + msg.msg_namelen = sizeof(addr); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; ++#if !defined(SOLARIS) + msg.msg_control = NULL; + msg.msg_controllen = 0; ++#endif + + printf("\n----------------------udp sendmsg() TEST-------------------\n\n"); + wb=0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Apr 4 01:05:20 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 3 Apr 2014 23:05:20 +0000 Subject: SF.net SVN: gar:[23321] csw/mgar/pkg/torsocks/trunk/Makefile Message-ID: <3g0Kcn3DNGz1BP@mail.opencsw.org> Revision: 23321 http://sourceforge.net/p/gar/code/23321 Author: jake_goerzen Date: 2014-04-03 23:05:17 +0000 (Thu, 03 Apr 2014) Log Message: ----------- torsocks: run autoreconf -i before configure to fix libtool files Modified Paths: -------------- csw/mgar/pkg/torsocks/trunk/Makefile Modified: csw/mgar/pkg/torsocks/trunk/Makefile =================================================================== --- csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-03 17:33:28 UTC (rev 23320) +++ csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-03 23:05:17 UTC (rev 23321) @@ -19,3 +19,6 @@ include gar/category.mk +pre-configure: + cd $(WORKSRC) && autoreconf -i + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 4 09:03:43 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 4 Apr 2014 07:03:43 +0000 Subject: SF.net SVN: gar:[23322] csw/mgar/pkg Message-ID: <3g0XF233B2z1YF@mail.opencsw.org> Revision: 23322 http://sourceforge.net/p/gar/code/23322 Author: dmichelsen Date: 2014-04-04 07:03:40 +0000 (Fri, 04 Apr 2014) Log Message: ----------- k5ping/trunk: Initial commit, manpage formats wrong Added Paths: ----------- csw/mgar/pkg/k5ping/ csw/mgar/pkg/k5ping/branches/ csw/mgar/pkg/k5ping/tags/ csw/mgar/pkg/k5ping/trunk/ csw/mgar/pkg/k5ping/trunk/Makefile csw/mgar/pkg/k5ping/trunk/checksums csw/mgar/pkg/k5ping/trunk/files/ csw/mgar/pkg/k5ping/trunk/files/k5ping.8 csw/mgar/pkg/k5ping/trunk/files/k5ping.c Index: csw/mgar/pkg/k5ping/trunk =================================================================== --- csw/mgar/pkg/k5ping/trunk 2014-04-03 23:05:17 UTC (rev 23321) +++ csw/mgar/pkg/k5ping/trunk 2014-04-04 07:03:40 UTC (rev 23322) Property changes on: csw/mgar/pkg/k5ping/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/k5ping/trunk/Makefile =================================================================== --- csw/mgar/pkg/k5ping/trunk/Makefile (rev 0) +++ csw/mgar/pkg/k5ping/trunk/Makefile 2014-04-04 07:03:40 UTC (rev 23322) @@ -0,0 +1,34 @@ +NAME = zsh +VERSION = 9fb8c5 +GARTYPE = v2 + +DESCRIPTION = A test that KDC is performing AS_REQs, TGS_REQs, and krb524 + +MASTER_SITES = http://oskt.secure-endpoints.com/ +#DISTFILES += gitweb.cgi?p=k5ping;a=blob_plain;f=k5ping.c;hb=HEAD +#DISTFILES += gitweb.cgi?p=k5ping;a=blob_plain;f=k5ping.8;hb=HEAD +# GIT support is only included for Github at the moment +DISTFILES += k5ping.c +DISTFILES += k5ping.8 + +VENDOR_URL = http://oskt.secure-endpoints.com/k5ping.html + +BUILD_DEP_PKGS += CSWlibkrb5-dev + +# There is no configure +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +# There is no testsuite +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKDIR) && $(BUILD_ENV) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -lkrb5 -lcom_err -o k5ping k5ping.c + @$(MAKECOOKIE) + +install-custom: + ginstall -D -m 0755 $(WORKDIR)/k5ping $(DESTDIR)$(bindir)/k5ping + ginstall -D -m 0644 $(WORKDIR)/k5ping.8 $(DESTDIR)$(mandir)/man8/k5ping.8 + @$(MAKECOOKIE) Added: csw/mgar/pkg/k5ping/trunk/checksums =================================================================== Added: csw/mgar/pkg/k5ping/trunk/files/k5ping.8 =================================================================== --- csw/mgar/pkg/k5ping/trunk/files/k5ping.8 (rev 0) +++ csw/mgar/pkg/k5ping/trunk/files/k5ping.8 2014-04-04 07:03:40 UTC (rev 23322) @@ -0,0 +1,115 @@ +.\" +.\" Copyright 2009 Morgan Stanley and Co. Incorporated +.\" +.\" 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. +.\" +.\" Blame: Roland Dowdeswell +.Dd January 25, 2005 +.Os +.Dt K5PING 8 +.Sh NAME +.Nm k5ping +.Nd kerberos server ping utility +.Sh SYNOPSIS +.Nm +.Op Fl 459ktuv +.Op Fl n Ar num +.Op Fl p Ar princ +.Op Fl P Ar pass +.Op Fl S Ar sprinc +.Ar kdc +.Op Ar kdc Ar ... +.Sh DESCRIPTION +.Nm +tests various operations against each of the KDCs on the command line. +By default, +.Nm +will perform the follow list of actions: +.Pp +.Bl -enum -width indent +.It +Authenticate to Kerberos 5 via TCP, +.It +Use the resulting credential to request a service ticket for +.Ar sprinc , +.It +Authenticate to Kerberos 5 via UDP, +.It +Use the resulting credential to request a service ticket for +.Ar sprinc , +.It +Use the credential from the last Kerberos 5 AS_REQ +to request a Kerberos IV ticket for +.Ar sprinc , +via the krb524 service, +.It +Authenticate to Kerberos IV, and use the credential to +request a service ticket for +.Ar sprinc . +.El +.Pp +By default +.Nm +will test Kerberos 5 TCP/UDP and Kerberos 524, but not Kerberos IV as its +use has been deprecated. +.Pp +This is useful for quickly verifying the health of a kerberos server, +and is suitable for inclusion in shell/perl scripts that check out +the sanity of the Kerberos 5 world. +.Pp +The options are as follows: +.Bl -tag -width indentxxx +.It Fl 4 +Test Kerberos IV. +.It Fl 5 +Test Kerberos 5. +.It Fl 9 +Test krb524. +.It Fl k +Use a keytab rather than a passwd. +.It Fl n Ar num +Loop over the test +.Ar num +times. +.It Fl P Ar pass +The password for the client principal. +.It Fl p Ar princ +Client principal. +.It Fl S Ar sprinc +The service principal. +.It Fl t +Use TCP when testing Kerberos 5. +.It Fl u +Use UDP when testing Kerberos 5. +.It Fl v +Increment verbose level. May be specified more than once. +.El +.Sh SEE ALSO +.Xr kinit 1 , +.Xr krb524init 1 , and +.Xr kvno 1 . +.Sh BUGS +.Ar Princ +and +.Ar sprinc +must be in the same realm. +.Pp +If Kerberos IV is used, then temporary files are used in +.Pa /tmp . Added: csw/mgar/pkg/k5ping/trunk/files/k5ping.c =================================================================== --- csw/mgar/pkg/k5ping/trunk/files/k5ping.c (rev 0) +++ csw/mgar/pkg/k5ping/trunk/files/k5ping.c 2014-04-04 07:03:40 UTC (rev 23322) @@ -0,0 +1,705 @@ +/* */ + +/*- + * Copyright 2009 Morgan Stanley and Co. Incorporated + * Copyright 2013 Roland C. Dowdeswell + * + * 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. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +#ifdef HAVE_KRB4 +#include +#endif + +/* + * Prototypes. + */ + +static void usage(void); +static void fail_msg(const char *, int, const char *, const char *); +static void parse_kdc(const char *host); +static int kvno4(krb5_context, const char *, krb5_principal); +static int kvno5(krb5_context, const char *, int, krb5_principal, + krb5_principal, krb5_ccache); +static int k5ping(krb5_context, const char *, int, krb5_principal, + int, const char *, krb5_principal); +#ifdef HAVE_KRB4 +static int k4ping(krb5_context, const char *, krb5_principal, const char *, + krb5_principal); +static int k524ping(krb5_context, const char *, const char *); +#endif + +/* + * Macros. These can be set at each individual site. + */ + +#define PING_PRINC "k5ping_princ" +#define PING_PASSWD "k5ping_passwd" + +#define PING_SPRINC "k5ping_princ" + +/* + * Global variables. + */ + +char *progname = NULL; + +/* Mutable KDC information */ +char current_kdc[1024]; +int current_port; +int current_secport; +int current_socktype = SOCK_STREAM; +int current_family = AF_INET; +int force_udp = 0; +int verbose = 0; + +#define VERBOSE(x,y) if (verbose >= (x)) fprintf y + +#define K5BAIL_DECLS \ + krb5_error_code kret; \ + char croakstr[2048] = ""; + +#define BAIL(x, y) do { \ + kret = x; \ + if (kret) { \ + snprintf(croakstr, sizeof(croakstr), \ + "%s: %s", #x, y); \ + kret = 1; \ + goto done; \ + } \ + } while (0) + +#ifdef HAVE_HEIMDAL +#define K5BAIL(x) do { \ + kret = x; \ + if (kret) { \ + const char *tmp; \ + \ + tmp = krb5_get_error_message(ctx, kret); \ + if (tmp) { \ + snprintf(croakstr, sizeof(croakstr), \ + "%s: %s", #x, tmp); \ + krb5_free_error_message(ctx, tmp); \ + } else { \ + snprintf(croakstr, sizeof(croakstr), \ + "%s: unknown error", #x); \ + } \ + kret = 1; \ + goto done; \ + } \ + } while (0) +#else +#define K5BAIL(x) BAIL(x, error_message(kret)) +#endif + + +/* + * We over-ride the krb5_locate_kdc() function from -lkrb5 so that + * we control both the horizontal and the verticle when it comes to + * choosing which KDCs will be used. As of MIT Kerberos 1.3, this + * function takes socktype and family arguments. We have two styles + * here at the moment: ``OLD_MIT'' should work with 1.3-1.9 or so. + * The default style should work with 1.10 and 1.11. + */ + +#ifdef OLD_MIT /* XXXrcd: need to define what versions. */ + +struct addrs { + struct addrinfo *ai; + void (*freefn)(void *); + void *data; +}; + +struct addrlist { + struct addrs *addrs; + size_t naddrs; + size_t space; +}; + +krb5_error_code +krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, + struct addrlist *addrlist, int get_masters, + int socktype, int family) +{ + krb5_error_code ret; + struct addrinfo *addrs; + struct addrinfo *a; + struct addrinfo hint; + struct addrs *al_addrs; + char portbuf[16]; + size_t num; + int err; + + VERBOSE(3, (stderr, "krb5_locate_kdc(context, \"%s\", addrlist, " + "%d, %d, %d ) called\n", realm->data, get_masters, socktype, + family)); + + memset(addrlist, 0x0, sizeof(*addrlist)); + + /* + * krb524d is always a udp service, so we if we are doing 524, + * then we hardwire to SOCK_DGRAM. + */ + + if (socktype != 0 && ((!force_udp && socktype != current_socktype) || + (force_udp && socktype != SOCK_DGRAM))) + return KRB5_REALM_CANT_RESOLVE; + + memset(&hint, 0, sizeof(hint)); + hint.ai_family = family; + hint.ai_socktype = socktype; +#ifdef AI_NUMERICSERV + hint.ai_flags = AI_NUMERICSERV; +#endif + + snprintf(portbuf, sizeof(portbuf), "%d", ntohs(current_port)); + /* XXXrcd: errors... */ + + err = getaddrinfo(current_kdc, portbuf, &hint, &addrs); + if (err) { + fprintf(stderr, "can't resolve %s:%s: %s\n", + current_kdc, portbuf, gai_strerror(err)); + return KRB5_REALM_CANT_RESOLVE; + } + + for (num=0, a=addrs; a; a=a->ai_next, num++) + ; + + al_addrs = calloc(sizeof(*al_addrs) * num, 1); + /* XXXrcd: errors... */ + + for (num=0, a=addrs; a; a=a->ai_next, num++) { + al_addrs[num].ai = a; + if (num == 0) { + al_addrs[num].freefn = freeaddrinfo; + al_addrs[num].data = a; + } + } + + (*addrlist).addrs = al_addrs; + (*addrlist).naddrs = num; + (*addrlist).space = num; + + VERBOSE(3, (stderr, "krb5_locate_kdc(context, \"%s\", addrlist, " + "%d, %d, %d ) returning %d address(es)\n", realm->data, + get_masters, socktype, family, num)); + + return 0; +} +#else +/* A single server hostname or address. */ +struct server_entry { + char *hostname; /* NULL -> use addrlen/addr instead */ + int port; /* Used only if hostname set */ + int socktype; /* May be 0 for UDP/TCP if hostname set */ + int family; /* May be 0 (aka AF_UNSPEC) if hostname set */ + size_t addrlen; + struct sockaddr_storage addr; +}; + +/* A list of server hostnames/addresses. */ +struct serverlist { + struct server_entry *servers; + size_t nservers; +}; +#define SERVERLIST_INIT { NULL, 0 } + +enum locate_service_type { + locate_service_kdc = 1, + locate_service_master_kdc, + locate_service_kadmin, + locate_service_krb524, + locate_service_kpasswd +}; + +krb5_error_code +k5_locate_server(krb5_context ctx, const krb5_data *realm, + struct serverlist *serverlist, enum locate_service_type svc, + int socktype) +{ + struct server_entry *se; + + VERBOSE(3, (stderr, "k5_locate_server(ctx, \"%s\", serverlist, " + "%d, %d, %d ) called\n", realm->data, socktype)); + + /* + * krb524d is always a udp service, so we if we are doing 524, + * then we hardwire to SOCK_DGRAM. + */ + + if (socktype != 0 && ((!force_udp && socktype != current_socktype) || + (force_udp && socktype != SOCK_DGRAM))) + return KRB5_REALM_CANT_RESOLVE; + + VERBOSE(3, (stderr, "adding %s to the list...\n", current_kdc)); + + se = calloc(sizeof(*se), 1); + if (!se) + return ENOMEM; + + se->hostname = strdup(current_kdc); + se->port = current_port; + se->socktype = current_socktype; + se->family = AF_UNSPEC; + + serverlist->servers = se; + serverlist->nservers = 1; + + if (!se->hostname) { + free(se); + return ENOMEM; + } + + return 0; +} +#endif + +#ifdef HAVE_KRB4 +/* + * We also over-ride krb_get_krbhst() in the same way. + */ + +int +krb_get_krbhst(char *host, const char *realm, int n) +{ + + VERBOSE(3, (stderr, "krb_get_krbhst(host, \"%s\", %d) called\n", + realm, n)); + + if (n > 1) + return KFAILURE; + + VERBOSE(3, (stderr, "krb_get_krbhst copying in %s\n", current_kdc)); + + strcpy(host, current_kdc); + return 0; +} +#endif + +/* This function sets global variables */ +static void +parse_kdc(const char *host) +{ + char *tmp = NULL; + + strncpy(current_kdc, host, sizeof(current_kdc)); + current_kdc[sizeof(current_kdc) - 1] = '\0'; + + current_port = htons(88); + current_secport = 0; + + tmp = strchr(current_kdc, ':'); + if (tmp) { + *tmp++ = '\0'; + current_port = htons(atoi(tmp)); + } + + VERBOSE(3, (stderr, "parse_kdc(%s): kdc = %s, port = %d\n", host, + current_kdc, ntohs(current_port))); +} + +void +usage(void) +{ + + fprintf(stderr, "usage: %s [-459tuv] [-p princ] [-P pass] " + "[-S sprinc]\n", progname); + exit(1); +} + +static void +fail_msg(const char *type, int socktype, const char *host, const char *error) +{ + + fprintf(stderr, "k5ping(%s) ERROR - %s/%s ping failed: %s\n", host, + type, socktype == SOCK_DGRAM ? "udp" : "tcp", error); +} + +#ifdef HAVE_KRB4 +static int +kvno4(krb5_context ctx, const char *host, krb5_principal sprinc) +{ + krb5_error_code kerr; + KTEXT_ST req; + CREDENTIALS creds; + int err = 0; + char name[ANAME_SZ]; + char instance[INST_SZ]; + char realm[REALM_SZ]; + + VERBOSE(1, (stderr, "initiating kvno4/udp ping to %s\n", host)); + + kerr = krb5_524_conv_principal(ctx, sprinc, name, instance, realm); + if (kerr) { + fail_msg("kvno4", SOCK_DGRAM, host, error_message(kerr)); + goto bail; + } + + err = krb_mk_req(&req, name, instance, realm, 0); + if (err) + goto bail; + + err = krb_get_cred(name, instance, realm, &creds); + if (err) + goto bail; + + VERBOSE(2, (stderr, "%s.%s@%s kvno = %d\n", name, instance, realm, + creds.kvno)); + +bail: + if (err) + fail_msg("kvno4", SOCK_DGRAM, host, krb_get_err_text(err)); + return err; +} +#endif + +static int +kvno5(krb5_context ctx, const char *host, int socktype, krb5_principal princ, + krb5_principal sprinc, krb5_ccache ccache) +{ + krb5_error_code kerr = 0; + krb5_creds increds; + krb5_creds *outcreds = NULL; + krb5_ticket *ticket = NULL; + + VERBOSE(1, (stderr, "initiating kvno5/%s ping to %s\n", + socktype == SOCK_DGRAM ? "udp" : "tcp", host)); + + memset(&increds, 0x0, sizeof(increds)); + increds.client = princ; + increds.server = sprinc; + kerr = krb5_get_credentials(ctx, 0, ccache, &increds, &outcreds); + if (kerr) + goto bail; + + kerr = krb5_decode_ticket(&outcreds->ticket, &ticket); + if (kerr) + goto bail; + + VERBOSE(2, (stderr, "kvno5 says kvno = %d\n", ticket->enc_part.kvno)); + +bail: + if (kerr) + fail_msg("kvno5", socktype, host, error_message(kerr)); + if (ticket) + krb5_free_ticket(ctx, ticket); + if (outcreds) + krb5_free_creds(ctx, outcreds); + + return kerr; +} + +static int +k5ping(krb5_context ctx, const char *host, int socktype, krb5_principal princ, + int use_kt, const char *passwd, krb5_principal sprinc) +{ + K5BAIL_DECLS; + krb5_error_code kerr; + krb5_ccache ccache = NULL; + krb5_keytab kt; + krb5_creds creds; + krb5_get_init_creds_opt *opt = NULL; + + VERBOSE(1, (stderr, "initiating kerberos5/%s ping to %s\n", + socktype == SOCK_DGRAM ? "udp" : "tcp", host)); + + parse_kdc(host); + current_socktype = socktype; + + K5BAIL(krb5_cc_resolve(ctx, "MEMORY:k5ping", &ccache)); + + K5BAIL(krb5_get_init_creds_opt_alloc(ctx, &opt)); + krb5_get_init_creds_opt_set_tkt_life(opt, 15 * 60); + + if (use_kt) { + K5BAIL(krb5_kt_default(ctx, &kt)); + K5BAIL(krb5_get_init_creds_keytab(ctx, &creds, princ, kt, 0, + NULL, opt)); + } else { + K5BAIL(krb5_get_init_creds_password(ctx, &creds, princ, passwd, + krb5_prompter_posix, NULL, 0, NULL, opt)); + } + + K5BAIL(krb5_cc_store_cred(ctx, ccache, &creds)); + + kret = kvno5(ctx, host, socktype, princ, sprinc, ccache); +done: + if (ccache) + krb5_cc_destroy(ctx, ccache); + + /* XXXrcd: free a few more things here... */ + /* opt. creds. */ + + if (croakstr[0]) + fail_msg("kerberos5", socktype, host, croakstr); + + return kret; +} + +#if HAVE_KRB4 +static int +k4ping(krb5_context ctx, const char *host, krb5_principal princ, + const char *passwd, krb5_principal sprinc) +{ + krb5_error_code kerr; + int ret; + char name[ANAME_SZ]; + char instance[INST_SZ]; + char realm[REALM_SZ]; + + VERBOSE(1, (stderr, "initiating kerberos4/udp ping to %s\n", host)); + parse_kdc(host); + kerr = krb5_524_conv_principal(ctx, princ, name, instance, realm); + if (kerr) { + fail_msg("kerberos4", SOCK_DGRAM, host, error_message(kerr)); + ret = 1; + goto bail; + } + + ret = krb_get_pw_in_tkt(name, instance, realm, "krbtgt", + realm, 3600 /* seconds */, (char *)passwd); + if (ret) { + fail_msg("kerberos4", SOCK_DGRAM, host, krb_get_err_text(ret)); + goto bail; + } + ret = kvno4(ctx, host, sprinc); + /* XXXrcd */ + k_logout_k4(ctx, NULL, K_OPT_NONE); + +bail: + return ret; +} + +static int +k524ping(krb5_context ctx, const char *host, const char *tsprinc) +{ + krb5_principal sprinc = NULL; + CREDENTIALS v4creds; + int kret; + + VERBOSE(1, (stderr, "initiating kerberos524/udp ping to %s\n", host)); + + parse_kdc(host); + + /* + * Apparently, k_convert_creds_524() seems to corrupt + * sprinc... + */ + + kret = krb5_parse_name(ctx, tsprinc, &sprinc); + if (kret) { + fprintf(stderr, "malformed princ %s: %s\n", tsprinc, + error_message(kret)); + exit(127); + } + + force_udp = 1; + kret = k_convert_creds_524(ctx, sprinc, &v4creds); + force_udp = 0; + if (kret) { + fail_msg("kerberos524", SOCK_DGRAM, host, k_error_string(ctx)); + goto bail; + } + +bail: +#if 0 + krb5_free_principal(ctx, sprinc); +#endif + return kret; +} +#endif + +int +main(int argc, char **argv) +{ + K5BAIL_DECLS; + krb5_context ctx; + krb5_principal princ; + krb5_principal sprinc; + int ch; + int ret; + int do_tcp = 0; + int do_udp = 0; + int do_v4 = 0; + int do_v5 = 0; + int do_524 = 0; + int times = 1; + int use_kt = 0; + char v4_ticket_file[128]; + char *passwd = NULL; + char *tprinc = NULL; + char *tsprinc = NULL; + + progname = strrchr(argv[0], '/'); + if (progname) + progname++; + else + progname = argv[0]; + + while ((ch = getopt(argc, argv, "459P:S:kn:p:tuv")) != -1) + switch (ch) { + case '4': + do_v4 = 1; + break; + case '5': + do_v5 = 1; + break; + case '9': + do_524 = 1; + break; + case 'P': + free(passwd); + passwd = strdup(optarg); + break; + case 'S': + free(tsprinc); + tsprinc = strdup(optarg); + break; + case 'k': + use_kt = 1; + break; + case 'n': + times = atoi(optarg); + break; + case 'p': + free(tprinc); + tprinc = strdup(optarg); + break; + case 't': + do_tcp = 1; + break; + case 'u': + do_udp = 1; + break; + case 'v': + verbose++; + break; + default: + usage(); + } + argc -= optind; + argv += optind; + + /* Check sanity */ + + if (passwd && use_kt) { + fprintf(stderr, "Cannot use both passwd and keytab.\n"); + exit(1); + } + +#ifdef HAVE_KRB4 + if (do_v4 && use_kt) { + fprintf(stderr, "Cannot use keytab with Kerberos IV.\n"); + exit(1); + } +#endif + +#ifndef HAVE_KRB4 + if (do_v4 || do_524) { + fprintf(stderr, "Kerberos IV unsupported in this " + "implementation.\n"); + exit(1); + } +#endif + + /* Fill in default values */ + + if (!tprinc) + tprinc = strdup(PING_PRINC); + if (!tsprinc) + tsprinc = strdup(PING_SPRINC); + if (!use_kt && !passwd) + passwd = strdup(PING_PASSWD); + if (!use_kt && !*passwd) { /* on empty passwds we prompt for it */ + passwd = getpass("Password:"); + } + + if (!do_tcp && !do_udp) + do_tcp = do_udp = 1; + if (!do_v4 && !do_v5 && !do_524) + do_v5 = do_524 = 1; + if (do_524) + do_v5 = 1; + + K5BAIL(krb5_init_context(&ctx)); + K5BAIL(krb5_parse_name(ctx, tprinc, &princ)); + K5BAIL(krb5_parse_name(ctx, tsprinc, &sprinc)); + + free(tprinc); + free(tsprinc); + krb5_unparse_name(ctx, princ, &tprinc); + krb5_unparse_name(ctx, sprinc, &tsprinc); + +#ifdef HAVE_KRB4 + sprintf(v4_ticket_file, "/tmp/k5ping_tkt4_%d_%d", getpid(), getuid()); + k_set_default_cache_k4(ctx, v4_ticket_file); +#endif + + VERBOSE(1, (stderr, "princ: %s\nsprinc: %s\n", tprinc, tsprinc)); + + while (times-- > 0) { + int i; + + ret = 0; + for (i=0; argv[i]; i++) { + if (do_v5 && do_tcp && k5ping(ctx, argv[i], SOCK_STREAM, + princ, use_kt, passwd, sprinc)) { + ret++; + continue; + } + if (do_v5 && do_udp && k5ping(ctx, argv[i], SOCK_DGRAM, + princ, use_kt, passwd, sprinc)) { + ret++; + continue; + } +#ifdef HAVE_KRB4 + if (do_524 && k524ping(ctx, argv[i], tsprinc)) { + ret++; + continue; + } + if (do_v4 && k4ping(ctx, argv[i], princ, passwd, + sprinc)) { + ret++; + continue; + } +#endif + if (times == 0) + printf("k5ping(%s): successful\n", argv[i]); + } + } + +done: + if (croakstr[0]) + fprintf(stderr, "FATAL: %s\n", croakstr); + + exit(ret); +} 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 Apr 4 09:13:05 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 4 Apr 2014 07:13:05 +0000 Subject: SF.net SVN: gar:[23323] csw/mgar/pkg/k5ping/trunk/Makefile Message-ID: <3g0XRb2Fssz4n@mail.opencsw.org> Revision: 23323 http://sourceforge.net/p/gar/code/23323 Author: dmichelsen Date: 2014-04-04 07:13:04 +0000 (Fri, 04 Apr 2014) Log Message: ----------- k5ping/trunk: Fix manpage and deps Modified Paths: -------------- csw/mgar/pkg/k5ping/trunk/Makefile Modified: csw/mgar/pkg/k5ping/trunk/Makefile =================================================================== --- csw/mgar/pkg/k5ping/trunk/Makefile 2014-04-04 07:03:40 UTC (rev 23322) +++ csw/mgar/pkg/k5ping/trunk/Makefile 2014-04-04 07:13:04 UTC (rev 23323) @@ -1,4 +1,4 @@ -NAME = zsh +NAME = k5ping VERSION = 9fb8c5 GARTYPE = v2 @@ -14,7 +14,14 @@ VENDOR_URL = http://oskt.secure-endpoints.com/k5ping.html BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWgroff +PACKAGES += CSWk5ping +SPKG_DESC_CSWk5ping = A test that KDC is performing AS_REQs, TGS_REQs, and krb524 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWk5ping += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWk5ping += CSWlibcom-err3 + # There is no configure CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom @@ -30,5 +37,7 @@ install-custom: ginstall -D -m 0755 $(WORKDIR)/k5ping $(DESTDIR)$(bindir)/k5ping - ginstall -D -m 0644 $(WORKDIR)/k5ping.8 $(DESTDIR)$(mandir)/man8/k5ping.8 + @# The manpage uses special macro packages, preformat for now + ginstall -d -m 0755 $(DESTDIR)$(mandir)/cat8 + $(bindir)/gnroff -man $(WORKDIR)/k5ping.8 >$(DESTDIR)$(mandir)/cat8/k5ping.8 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 4 10:49:12 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 4 Apr 2014 08:49:12 +0000 Subject: SF.net SVN: gar:[23324] csw/mgar/pkg/lang-python/twisted/trunk/Makefile Message-ID: <3g0ZZV0cBFzFr@mail.opencsw.org> Revision: 23324 http://sourceforge.net/p/gar/code/23324 Author: dmichelsen Date: 2014-04-04 08:49:09 +0000 (Fri, 04 Apr 2014) Log Message: ----------- lang-python/twisted/trunk: Add more package dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2014-04-04 07:13:04 UTC (rev 23323) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2014-04-04 08:49:09 UTC (rev 23324) @@ -23,15 +23,22 @@ LICENSE = LICENSE +BUILD_DEP_PKGS += CSWpy-zope-interface +BUILD_DEP_PKGS += CSWpy-openssl + PACKAGES += CSWpy-twisted SPKG_DESC_CSWpy-twisted = An event-driven networking engine RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-crypto +RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-asn1 OBSOLETED_BY_CSWpy-twisted = CSWtwisted CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface +CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-crypto +CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-asn1 CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/conch/unix.py CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/conch/unix.py 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 Apr 4 12:33:15 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 4 Apr 2014 10:33:15 +0000 Subject: SF.net SVN: gar:[23325] csw/mgar/pkg/lang-python/twisted/trunk/Makefile Message-ID: <3g0ctb0H3vz11f@mail.opencsw.org> Revision: 23325 http://sourceforge.net/p/gar/code/23325 Author: dmichelsen Date: 2014-04-04 10:33:11 +0000 (Fri, 04 Apr 2014) Log Message: ----------- lang-python/twisted/trunk: Revert dependency, this is a soft-dependency from buildbot Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2014-04-04 08:49:09 UTC (rev 23324) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2014-04-04 10:33:11 UTC (rev 23325) @@ -32,13 +32,9 @@ RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-crypto -RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-asn1 OBSOLETED_BY_CSWpy-twisted = CSWtwisted CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface -CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-crypto -CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-asn1 CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/conch/unix.py CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/conch/unix.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Apr 4 19:56:34 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 4 Apr 2014 17:56:34 +0000 Subject: SF.net SVN: gar:[23326] csw/mgar/pkg/torsocks/trunk/Makefile Message-ID: <3g0pkB3C8JzDj@mail.opencsw.org> Revision: 23326 http://sourceforge.net/p/gar/code/23326 Author: jake_goerzen Date: 2014-04-04 17:56:32 +0000 (Fri, 04 Apr 2014) Log Message: ----------- torsocks: replace shell in wrapper executable scripts Modified Paths: -------------- csw/mgar/pkg/torsocks/trunk/Makefile Modified: csw/mgar/pkg/torsocks/trunk/Makefile =================================================================== --- csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-04 10:33:11 UTC (rev 23325) +++ csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-04 17:56:32 UTC (rev 23326) @@ -15,6 +15,13 @@ PATCHFILES = torsocks-HEAD-2034625.nww.solaris.patch +# replace shell in wrapper executable scripts +REINPLACEMENTS += shell +REINPLACE_MATCH_shell = /bin/sh +REINPLACE_WITH_shell = /opt/csw/bin/bash +REINPLACE_FILES_shell += src/torsocks.in +REINPLACE_FILES_shell += src/usewithtor.in + 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 jake_goerzen at users.sourceforge.net Sat Apr 5 02:27:33 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 5 Apr 2014 00:27:33 +0000 Subject: SF.net SVN: gar:[23327] csw/mgar/pkg/torsocks/trunk/Makefile Message-ID: <3g0zPB2JVGzb9@mail.opencsw.org> Revision: 23327 http://sourceforge.net/p/gar/code/23327 Author: jake_goerzen Date: 2014-04-05 00:27:31 +0000 (Sat, 05 Apr 2014) Log Message: ----------- torsocks: add runtime depend CSWbash Modified Paths: -------------- csw/mgar/pkg/torsocks/trunk/Makefile Modified: csw/mgar/pkg/torsocks/trunk/Makefile =================================================================== --- csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-04 17:56:32 UTC (rev 23326) +++ csw/mgar/pkg/torsocks/trunk/Makefile 2014-04-05 00:27:31 UTC (rev 23327) @@ -24,6 +24,9 @@ CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS_CSWtorsocks += CSWbash +CHECKPKG_OVERRIDES_CSWtorsocks += surplus-dependency|CSWbash + include gar/category.mk pre-configure: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sat Apr 5 12:05:38 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sat, 5 Apr 2014 10:05:38 +0000 Subject: SF.net SVN: gar:[23328] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Message-ID: <3g1DDF4hwRzvW@mail.opencsw.org> Revision: 23328 http://sourceforge.net/p/gar/code/23328 Author: cgrzemba Date: 2014-04-05 10:05:36 +0000 (Sat, 05 Apr 2014) Log Message: ----------- lang-python/pygtk/trunk: remove dependency py_gobject Modified Paths: -------------- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2014-04-05 00:27:31 UTC (rev 23327) +++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2014-04-05 10:05:36 UTC (rev 23328) @@ -42,7 +42,7 @@ BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += CSWpython27-dev -BUILD_DEP_PKGS += CSWpy-gobject-dev +# BUILD_DEP_PKGS += CSWpy-gobject-dev BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibatk-dev BUILD_DEP_PKGS += CSWpangodevel @@ -75,7 +75,7 @@ RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpygobject +# RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpygobject RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpy-cairo RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibpango1-0-0 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgcc-s1 @@ -91,7 +91,7 @@ CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkfilechooser.html CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkrcstyle.html # pygtk do not work without this -CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpygobject +# CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpygobject # gtk do not work without this CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpy-cairo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sat Apr 5 12:33:34 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sat, 5 Apr 2014 10:33:34 +0000 Subject: SF.net SVN: gar:[23329] csw/mgar/pkg/aide/trunk/Makefile Message-ID: <3g1DrR2wqCz10T@mail.opencsw.org> Revision: 23329 http://sourceforge.net/p/gar/code/23329 Author: cgrzemba Date: 2014-04-05 10:33:34 +0000 (Sat, 05 Apr 2014) Log Message: ----------- aide/trunk: update dependencies Modified Paths: -------------- csw/mgar/pkg/aide/trunk/Makefile Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2014-04-05 10:05:36 UTC (rev 23328) +++ csw/mgar/pkg/aide/trunk/Makefile 2014-04-05 10:33:34 UTC (rev 23329) @@ -37,11 +37,8 @@ RUNTIME_DEP_PKGS_CSWaide += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWaide += CSWlibz1 -RUNTIME_DEP_PKGS_CSWaide += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWaide += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWaide += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWaide += CSWlibmhash -RUNTIME_DEP_PKGS_CSWaide += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWaide += CSWlibmhash2 RUNTIME_DEP_PKGS_CSWaide += CSWlibpq5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 5 14:32:18 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 12:32:18 +0000 Subject: SF.net SVN: gar:[23330] csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Message-ID: <3g1HTW1TfDz17r@mail.opencsw.org> Revision: 23330 http://sourceforge.net/p/gar/code/23330 Author: wahwah Date: 2014-04-05 12:32:18 +0000 (Sat, 05 Apr 2014) Log Message: ----------- find-obsolete-pkgs: Don't cache catalogs on disk It's cool to cache individual pkgstats because they never change (unless we change the data structure and need to reindex). Catalogs on the other hand change all the time and if we cache them on disk, we very quickly start getting stale data and wrong results. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Modified: csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2014-04-05 10:33:34 UTC (rev 23329) +++ csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2014-04-05 12:32:18 UTC (rev 23330) @@ -9,7 +9,7 @@ set PYTHONPATH=/path/to/.buildsys/v2 alternatively can used: sys.path.append('/path/to/.buildsys/v2') -Overview: +Overview: - read the stub hint from catalog * if any packages depend on the stub -> rebuild them * if nothing depends on the stub and the stub is present in the old/"from" @@ -38,15 +38,15 @@ logging.basicConfig(format='%(levelname)s %(asctime)s %(filename)s:%(lineno)d %(message)s') logger = logging.getLogger(__name__) -datadir=configuration.CHECKPKG_DIR % os.environ -# fn_revdep = os.path.join(datadir,'RevDeps_%s_%s_%s.json') -fn_cat = os.path.join(datadir,'catalog_%s_%s_%s.json') -fn_pkgs_to_remove = 'PkgsToRemoveFrom_%s_%s_%s.lst' -fn_pkgs_to_rebuild = 'PkgsToRebuildFrom_%s_%s_%s.html' +DATA_DIR = configuration.CHECKPKG_DIR % os.environ +CATALOG_CACHE_FILENAME_TMPL = os.path.join(DATA_DIR,'catalog_%s_%s_%s.json') -CatSubSet = namedtuple('CatSubSet', - 'pkgname, catalogname, md5_sum, version, dependlist, maintainer') +PKGS_TO_REMOVE_TMPL = 'PkgsToRemoveFrom_%s_%s_%s.lst' +PKGS_TO_REBUILD_TMPL = 'PkgsToRebuildFrom_%s_%s_%s.html' +CatSubSet = namedtuple('CatSubSet', ['pkgname', 'catalogname', 'md5_sum', + 'version', 'dependlist', 'maintainer']) + REBUILD_TMPL = """ Packages to rebuild @@ -89,48 +89,39 @@ class CompCatalog(object): + def __init__(self, name, arch, osrel, rest_client): + self.catrel = name + self.arch = arch + self.osrel = osrel + self.rest_client = rest_client + self.cached_stats = rest.CachedPkgstats( + os.path.join(DATA_DIR, 'pkgstats'), rest_client) - def __init__(self, name, arch, osrel, rest_client): - self.catrel = name - self.arch = arch - self.osrel = osrel - self.rest_client = rest_client + def CatSubSetFromFull(self, pkgitems): + """Returns a CatSubSet from full package stats.""" + pkgname = pkgitems['basic_stats']['pkgname'] + pkgdeplst = [i[0] for i in pkgitems['depends']] + maintainer = pkgitems['pkginfo']['EMAIL'].split('@')[0] + return CatSubSet(pkgname, + pkgitems['basic_stats']['catalogname'], + pkgitems['basic_stats']['md5_sum'], + pkgitems['basic_stats']['parsed_basename']['full_version_string'], + tuple(pkgdeplst), + maintainer) - def __getCat(self, name,arch,osrel): - ''' get dependcy list from catalog, read cached list if available ''' - pkg_by_pkgname = {} - disk_cache_path = fn_cat % (name, osrel, arch) - if os.path.exists(disk_cache_path): - logger.info('CompCatalog::getCat: use cached data: %s' % (fn_cat % (name,osrel,arch))) - with open(disk_cache_path) as fd: - data = cjson.decode(fd.read()) - pkg_by_pkgname = {} - for pkgname, lst in data.iteritems(): - lst[4] = tuple(lst[4]) - pkg_by_pkgname[pkgname] = CatSubSet(*lst) - else: - cat = self.rest_client.GetCatalog(name,arch,osrel) - for pkg in cat: - pkgitems = self.rest_client.GetPkgstatsByMd5(pkg['md5_sum']) - pkgname = pkgitems['basic_stats']['pkgname'] - try: - pkgdeplst = [ i[0] for i in pkgitems['depends']] - maintainer = pkgitems['pkginfo']['EMAIL'].split('@')[0] - pkg_by_pkgname[pkgname] = CatSubSet(pkgname, pkg['catalogname'], - pkg['md5_sum'], pkg['version'], - tuple(pkgdeplst), - maintainer) - except Exception as exc: - logger.error("CompCatalog::getPkgStat: %s %s %s", - type(exc), pkg.catalogname, pkg.md5_sum) - with open(disk_cache_path, "w") as fd: - fd.write(cjson.encode(pkg_by_pkgname)) - logger.info('CompCatalog::getCat: write cache file: %s' - % (fn_cat % (name,osrel,arch))) - return pkg_by_pkgname + def __getCat(self, catrel, arch, osrel): + """Get dependcy list from the database.""" + logging.info('__getCat(%s, %s, %s)' % (catrel, arch, osrel)) + pkg_by_pkgname = {} + cat = self.rest_client.GetCatalog(catrel, arch, osrel) + for pkg in cat: + pkgitems = self.rest_client.GetPkgstatsByMd5(pkg['md5_sum']) + catsubset = self.CatSubSetFromFull(pkgitems) + pkg_by_pkgname[catsubset.pkgname] = catsubset + return pkg_by_pkgname - def getCatalog(self): - return self.__getCat(self.catrel,self.arch,self.osrel) + def getCatalog(self): + return self.__getCat(self.catrel, self.arch, self.osrel) def processCat(catrel, arch, osrel, rest_client): @@ -207,20 +198,18 @@ def WriteToTextFiles(pkgs_to_drop, pkgs_to_rebuild, newcatrel, arch, osrel, obsolete): - print ('write %s' % (fn_pkgs_to_remove % (newcatrel,osrel,arch))) - with open(fn_pkgs_to_remove % (newcatrel, osrel, arch), "w") as fd: + print ('writing %s' % (PKGS_TO_REMOVE_TMPL % (newcatrel,osrel,arch))) + with open(PKGS_TO_REMOVE_TMPL % (newcatrel, osrel, arch), "w") as fd: for pkg in sorted(pkgs_to_drop, key=lambda p: p.catalogname): fd.write(pkg.catalogname + '\n') logger.info("number of packages to remove: %d" % len(pkgs_to_drop)) - print ('write %s' % (fn_pkgs_to_rebuild % (newcatrel,osrel,arch))) - with open(fn_pkgs_to_rebuild % (newcatrel,osrel,arch), "w") as fd: - # for pkg in sorted(pkgs_to_rebuild, key=lambda p: p.catalogname): - # fd.write(pkg.catalogname+'\n') + print ('write %s' % (PKGS_TO_REBUILD_TMPL % (newcatrel,osrel,arch))) + with open(PKGS_TO_REBUILD_TMPL % (newcatrel,osrel,arch), "w") as fd: template = jinja2.Template(REBUILD_TMPL) pkgs = sorted(pkgs_to_rebuild, key=lambda p: (p.maintainer, p.catalogname)) fd.write(template.render(catrel=newcatrel, osrel=osrel, arch=arch, pkgs=pkgs, obsolete=obsolete)) - logger.info("packages to rebuild: %d" % len(pkgs_to_rebuild)) + logger.info("# of packages to rebuild: %d" % len(pkgs_to_rebuild)) def GetCLIOptions(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 5 14:32:26 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 12:32:26 +0000 Subject: SF.net SVN: gar:[23331] csw/mgar/gar/v2/lib Message-ID: <3g1HTg081dz19M@mail.opencsw.org> Revision: 23331 http://sourceforge.net/p/gar/code/23331 Author: wahwah Date: 2014-04-05 12:32:26 +0000 (Sat, 05 Apr 2014) Log Message: ----------- pkgdb-web: Show maintainer email in catalog timing Catalog timing could be integrated into the main catalog endpoint. The clients would only need to deal with the extra fields, and take up the foo|bar formatting on themselves. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/representations.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-04-05 12:32:18 UTC (rev 23330) +++ csw/mgar/gar/v2/lib/python/models.py 2014-04-05 12:32:26 UTC (rev 23331) @@ -549,6 +549,9 @@ sqlbuilder.INNERJOINOn(None, CatalogGenData, Srv4FileStats.q.md5_sum==CatalogGenData.q.md5_sum), + sqlbuilder.INNERJOINOn(None, + Maintainer, + Srv4FileStats.q.maintainer==Maintainer.q.id), ] where = sqlbuilder.AND( Srv4FileInCatalog.q.osrel==sqo_osrel, @@ -557,22 +560,23 @@ Srv4FileStats.q.use_to_generate_catalogs==True, ) select = sqlbuilder.Select( - ['catalogname', - 'version_string', - 'pkgname', - 'basename', + ['catalogname', # 0 + 'version_string', # 1 + 'pkgname', # 2 + 'basename', # 3 'srv4_file_stats.md5_sum', # Hardcoded table name, is it portable? - 'size', - 'deps', - 'i_deps', - 'pkginfo_name', + 'size', # 5 + 'deps', # 6 + 'i_deps', # 7 + 'pkginfo_name', # 8 # The above columns are used to generate catalogs. # Additional columns can be added blow. - 'maintainer_id', - 'mtime', - 'created_on', - 'created_by', - ], + # 'maintainer.id', # 9 + 'maintainer.email', # 9 + 'mtime', # 10 + 'created_on', # 11 + 'created_by', # 12 + ], where=where, orderBy='catalogname', join=join) Modified: csw/mgar/gar/v2/lib/python/representations.py =================================================================== --- csw/mgar/gar/v2/lib/python/representations.py 2014-04-05 12:32:18 UTC (rev 23330) +++ csw/mgar/gar/v2/lib/python/representations.py 2014-04-05 12:32:26 UTC (rev 23331) @@ -17,9 +17,15 @@ # Full catalog entry, enough to write a line of a catalog file. CatalogEntry = collections.namedtuple( - 'CatalogEntry', 'catalogname version pkgname basename ' - 'md5_sum size deps category i_deps desc') + 'CatalogEntry', + ['catalogname', 'version', 'pkgname', 'basename', 'md5_sum', 'size', + 'deps', 'category', 'i_deps', 'desc']) +CatalogTimingEntry = collections.namedtuple( + 'CatalogTimingEntry', + ['catalogname', 'version', 'pkgname', 'basename', 'md5_sum', 'size', + 'deps', 'category', 'i_deps', 'desc', 'maintainer', 'mtime', 'inserted_on', 'inserted_by']) + PkgmapEntry = collections.namedtuple( 'PkgmapEntry', 'line, class_, mode, owner, group, path, target, type_, ' Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2014-04-05 12:32:18 UTC (rev 23330) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2014-04-05 12:32:26 UTC (rev 23331) @@ -662,6 +662,12 @@ return response +def FormatPkginstList(lst): + if lst: + return '|'.join(lst) + else: + return 'none' + def GetCatalogEntries(catrel_name, arch_name, osrel_name): """Returns a list of CatalogEntry tuples.""" try: @@ -670,31 +676,26 @@ except sqlobject.main.SQLObjectNotFound: raise web.notfound() rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) - def FormatList(lst): - if lst: - return '|'.join(lst) - else: - return 'none' - def GenCatalogEntry(row): + def MakeCatalogEntry(row): i_deps = cjson.decode(row[7]) - i_deps_str = FormatList(i_deps) + i_deps_str = FormatPkginstList(i_deps) deps_with_desc = cjson.decode(row[6]) deps = [x[0] for x in deps_with_desc if x[0].startswith('CSW')] - deps_str = FormatList(deps) + deps_str = FormatPkginstList(deps) entry = representations.CatalogEntry( catalogname=row[0], # 0 version=row[1], # 1 pkgname=row[2], # 2 basename=row[3], # 3 md5_sum=row[4], # 4 - size=str(row[5]), # 5 + size=row[5], # 5 # This needs to be an int in JSON deps=deps_str, # 6 category="none", # 7 i_deps=i_deps_str, # 8 desc=row[8], # 9 ) return entry - entries_list = [GenCatalogEntry(row) for row in rows] + entries_list = [MakeCatalogEntry(row) for row in rows] return entries_list @@ -709,9 +710,7 @@ entries_list = GetCatalogEntries(catrel_name, arch_name, osrel_name) response_list = [] for entry in entries_list: - entry_dict = entry._asdict() - entry_dict["size"] = int(entry_dict["size"]) - response_list.append(entry_dict) + response_list.append(entry._asdict()) response = cjson.encode(response_list) web.header('Content-Length', str(len(response))) return response @@ -745,23 +744,29 @@ except sqlobject.main.SQLObjectNotFound: raise web.notfound() rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) - def PrepareForJson(row): - # The size (5th row) is returned as a large integer, which cannot be represented - # in JSON. - # 'maintainer', #9 - # 'mtime', #10 - # 'created_on', #11 - # 'created_by', #12 - newrow = list(row) - newrow[5] = int(newrow[5]) - newrow[6] = cjson.decode(newrow[6]) - newrow[7] = cjson.decode(newrow[7]) - if newrow[10]: - newrow[10] = newrow[10].isoformat() - if newrow[11]: - newrow[11] = newrow[11].isoformat() - return newrow - rows = [PrepareForJson(x) for x in rows] + # Change this to return a list of dicts + def MakeCatalogTimingEntry(row): + i_deps = tuple(cjson.decode(row[7])) + deps_with_desc = cjson.decode(row[6]) + deps = tuple(x[0] for x in deps_with_desc if x[0].startswith('CSW')) + entry = representations.CatalogTimingEntry( + catalogname=row[0], # 0 + version=row[1], # 1 + pkgname=row[2], # 2 + basename=row[3], # 3 + md5_sum=row[4], # 4 + size=row[5], # 5 # This needs to be an int in JSON + deps=deps, # 6 + category="none", # 7 + i_deps=i_deps, # 8 + desc=row[8], # 9 + maintainer=row[9], + mtime=row[10].isoformat(), + inserted_on=row[11].isoformat(), + inserted_by=row[12], + ) + return entry + rows = [MakeCatalogTimingEntry(x)._asdict() for x in rows] response = cjson.encode(rows) web.header('Content-Length', str(len(response))) return response This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 5 14:32:34 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 12:32:34 +0000 Subject: SF.net SVN: gar:[23332] csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail. html Message-ID: <3g1HTk5f5Lz1B6@mail.opencsw.org> Revision: 23332 http://sourceforge.net/p/gar/code/23332 Author: wahwah Date: 2014-04-05 12:32:34 +0000 (Sat, 05 Apr 2014) Log Message: ----------- pkgdb-web: Unbreak the error tags view Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html Modified: csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2014-04-05 12:32:26 UTC (rev 23331) +++ csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2014-04-05 12:32:34 UTC (rev 23332) @@ -17,7 +17,7 @@ Additional information $for tag in tags: - $if tag.srv4_file.registered: + $if tag.srv4_file.registered_level_two: Revision: 23333 http://sourceforge.net/p/gar/code/23333 Author: aironskin Date: 2014-04-05 18:17:18 +0000 (Sat, 05 Apr 2014) Log Message: ----------- iozone/trunk: Update to new version 3.420 Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile csw/mgar/pkg/iozone/trunk/checksums Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2014-04-05 12:32:34 UTC (rev 23332) +++ csw/mgar/pkg/iozone/trunk/Makefile 2014-04-05 18:17:18 UTC (rev 23333) @@ -1,5 +1,5 @@ NAME = iozone -VERSION = 3.398 +VERSION = 3.420 DISTVERSION = $(subst .,_,$(VERSION)) GARTYPE = v2 Modified: csw/mgar/pkg/iozone/trunk/checksums =================================================================== --- csw/mgar/pkg/iozone/trunk/checksums 2014-04-05 12:32:34 UTC (rev 23332) +++ csw/mgar/pkg/iozone/trunk/checksums 2014-04-05 18:17:18 UTC (rev 23333) @@ -1 +1 @@ -ac6e7534c77602a1c886f3bb8679ad2a iozone3_398.tar +5205cd571c6e68440772f7e0af0712d6 iozone3_420.tar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 5 20:47:26 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 18:47:26 +0000 Subject: SF.net SVN: gar:[23334] csw/mgar/gar/v2/go Message-ID: <3g1TTT4hbLzFM@mail.opencsw.org> Revision: 23334 http://sourceforge.net/p/gar/code/23334 Author: wahwah Date: 2014-04-05 18:47:26 +0000 (Sat, 05 Apr 2014) Log Message: ----------- gen-catalog-index: A new utility Generates the catalog file. Modified Paths: -------------- csw/mgar/gar/v2/go/Makefile csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go Added Paths: ----------- csw/mgar/gar/v2/go/src/gen-catalog-index/ csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go Modified: csw/mgar/gar/v2/go/Makefile =================================================================== --- csw/mgar/gar/v2/go/Makefile 2014-04-05 18:17:18 UTC (rev 23333) +++ csw/mgar/gar/v2/go/Makefile 2014-04-05 18:47:26 UTC (rev 23334) @@ -3,7 +3,7 @@ # 1. gmake # 2. scp to the web host to replace the old binary -all: bin bin/catalog-release-to-disk +all: bin bin/catalog-release-to-disk bin/gen-catalog-index bin: mkdir -p bin @@ -11,14 +11,22 @@ bin/catalog-release-to-disk: src/catalog-release-to-disk/catalog-release-to-disk.o src/opencsw/diskformat/diskformat.o gccgo -g -o $@ $? +bin/gen-catalog-index: src/gen-catalog-index/gen-catalog-index.o src/opencsw/diskformat/diskformat.o + gccgo -g -o $@ $? + # This is a poor hack, but it gets it to compile. src/catalog-release-to-disk/catalog-release-to-disk.o: src/opencsw/diskformat/diskformat.o mkdir -p opencsw ln -sf ../src/opencsw/diskformat/diskformat.o opencsw/diskformat.o gccgo -o $@ -g -c src/catalog-release-to-disk/catalog-release-to-disk.go +src/gen-catalog-index/gen-catalog-index.o: src/opencsw/diskformat/diskformat.o + mkdir -p opencsw + ln -sf ../src/opencsw/diskformat/diskformat.o opencsw/diskformat.o + gccgo -o $@ -g -c src/gen-catalog-index/gen-catalog-index.go + %.o: %.go gccgo -o $@ -g -c $< clean: - rm -f src/opencsw/diskformat/diskformat.o bin/catalog-release-to-disk + rm -f src/opencsw/diskformat/diskformat.o bin/catalog-release-to-disk bin/gen-catalog-index Added: csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go =================================================================== --- csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go (rev 0) +++ csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go 2014-04-05 18:47:26 UTC (rev 23334) @@ -0,0 +1,53 @@ +package main + +import ( + "bufio" + "flag" + "log" + "os" + "opencsw/diskformat" +) + +// Command line flags +var catrel_flag string +var arch_flag string +var osrel_flag string +var out_file string + +func init() { + flag.StringVar(&out_file, "output", "catalog", + "The name of the file to generate.") + flag.StringVar(&catrel_flag, "catalog-release", "unstable", + "e.g. unstable, bratislava, kiel, dublin") + flag.StringVar(&osrel_flag, "os-release", "SunOS5.10", + "e.g. SunOS5.10") + flag.StringVar(&arch_flag, "arch", "sparc", + "{ sparc | i386 }") + flag.StringVar(&diskformat.PkgdbUrl, "pkgdb-url", + "http://buildfarm.opencsw.org/pkgdb/rest", + "Web address of the pkgdb app.") +} + +func main() { + flag.Parse() + spec := diskformat.CatalogSpec{catrel_flag, arch_flag, osrel_flag} + cws, err := diskformat.GetCatalogWithSpec(spec) + if err != nil { + log.Fatalln("Could not fetch", spec, ":", err) + } + + catalog_fd, err := os.Create(out_file) + if err != nil { + log.Fatalln("Could not open the output file for writing:", err) + } + defer catalog_fd.Close() + catbuf := bufio.NewWriter(catalog_fd) + defer catbuf.Flush() + + log.Println("Writing", spec, "to", out_file) + if err = diskformat.WriteCatalogIndex(catbuf, cws); err != nil { + log.Fatalln("Error while writing:", err) + } else { + log.Println("Catalog index written successfully") + } +} Modified: csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go =================================================================== --- csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go 2014-04-05 18:17:18 UTC (rev 23333) +++ csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go 2014-04-05 18:47:26 UTC (rev 23334) @@ -743,18 +743,32 @@ defer descbuf.Flush() } - // http://www.opencsw.org/manual/for-maintainers/catalog-format.html - ts_line := fmt.Sprintf("# CREATIONDATE %s\n", time.Now().Format(time.RFC3339)) - catbuf.WriteString(ts_line) + if err := WriteCatalogIndex(catbuf, cws); err != nil { + log.Println("Failed while writing to", catalog_file_path, + ":", err) + } for _, pkg := range cws.Pkgs { - catbuf.WriteString(pkg.AsCatalogEntry()) - catbuf.WriteString("\n") descbuf.WriteString(pkg.AsDescription()) descbuf.WriteString("\n") } } +// Write the catalog file to given Writer. File format as defined by +// http://www.opencsw.org/manual/for-maintainers/catalog-format.html +func WriteCatalogIndex(w *bufio.Writer, cws CatalogWithSpec) error { + ts_line := fmt.Sprintf("# CREATIONDATE %s\n", time.Now().Format(time.RFC3339)) + w.WriteString(ts_line) + + for _, pkg := range cws.Pkgs{ + _, err := w.WriteString(pkg.AsCatalogEntry()) + if err != nil { return err } + _, err = w.WriteString("\n") + if err != nil { return err } + } + return nil +} + // The main function of this package. func GenerateCatalogRelease(catrel string, catalog_root string) { log.Println("catrel:", catrel) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 5 22:05:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 20:05:53 +0000 Subject: SF.net SVN: gar:[23335] csw/mgar/gar/v2/lib/python/package_age.py Message-ID: <3g1TYN2j1TzJl@mail.opencsw.org> Revision: 23335 http://sourceforge.net/p/gar/code/23335 Author: wahwah Date: 2014-04-05 20:05:52 +0000 (Sat, 05 Apr 2014) Log Message: ----------- package-age: A toy program to get package ages Talks to the REST interface, gets catalog timing data and writes it to a file. The file is easy to import into R and analyze. Added Paths: ----------- csw/mgar/gar/v2/lib/python/package_age.py Added: csw/mgar/gar/v2/lib/python/package_age.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_age.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_age.py 2014-04-05 20:05:52 UTC (rev 23335) @@ -0,0 +1,63 @@ +#!/opt/csw/bin/python + +"""Download and generate package age dataset for analysis with R. + +It's a toy as of 2014-04-05. +""" + +import logging +import requests +import argparse +import dateutil.parser + +from lib.python import opencsw + + +class BadDateError(Exception): + """There was a bad date tag.""" + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('output', help='Output file') + args = parser.parse_args() + url = ('http://buildfarm.opencsw.org/pkgdb/rest/catalogs/' + 'unstable/i386/SunOS5.10/timing/') + data = requests.get(url).json() + with open(args.output, 'wb') as fd: + fd.write('catalogname maintainer date\n') + bad_dates = [] + for entry in data: + entry['maintainer'] = entry['maintainer'].split('@')[0] + parsed_fn = opencsw.ParsePackageFileName(entry['basename']) + dates_to_try = [] + if 'REV' in parsed_fn['revision_info']: + dates_to_try.append(parsed_fn['revision_info']['REV']) + else: + logging.warning('{catalogname} did not have a REV=. ' + 'Falling back to mtime.'.format(**entry)) + dates_to_try.append(entry['mtime']) + + for date_str in dates_to_try: + try: + date = dateutil.parser.parse(date_str) + break + except ValueError as exc: + logging.warning(exc) + logging.warning( + "WTF is {date} in {catalogname}? " + "Go home {maintainer}, you're drunk.".format( + catalogname=entry['catalogname'], + maintainer=entry['maintainer'], + date=date_str)) + bad_dates.append(date_str) + continue + entry['date'] = date.strftime('%Y-%m-%d') + line = '{catalogname} {maintainer} {date}\n'.format(**entry) + fd.write(line) + if bad_dates: + logging.warning('Bad dates encountered. mtime used as fallback.') + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/package_age.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 5 23:33:29 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 5 Apr 2014 21:33:29 +0000 Subject: SF.net SVN: gar:[23336] csw/mgar/gar/v2 Message-ID: <3g1WVX3HmczQH@mail.opencsw.org> Revision: 23336 http://sourceforge.net/p/gar/code/23336 Author: guengel Date: 2014-04-05 21:33:27 +0000 (Sat, 05 Apr 2014) Log Message: ----------- Changed lib/python/chkdbcat.py so that it uses gen-catalog-index. Modified Paths: -------------- csw/mgar/gar/v2/bin/chkdbcat csw/mgar/gar/v2/lib/python/chkdbcat.py csw/mgar/gar/v2/lib/python/chkdbcat_test.py Modified: csw/mgar/gar/v2/bin/chkdbcat =================================================================== --- csw/mgar/gar/v2/bin/chkdbcat 2014-04-05 20:05:52 UTC (rev 23335) +++ csw/mgar/gar/v2/bin/chkdbcat 2014-04-05 21:33:27 UTC (rev 23336) @@ -7,8 +7,8 @@ class MyCheckDBCatalog(chkdbcat.CheckDBCatalog): """Class overriding CheckDBCatalog.notify()""" - def __init__(self, catrel, arch, osrel, fn_ts, chkcat, verbose=False): - super(MyCheckDBCatalog,self).__init__(catrel, arch, osrel, fn_ts, chkcat) + def __init__(self, catrel, arch, osrel, fn_ts, gencat_bin, chkcat, verbose=False): + super(MyCheckDBCatalog,self).__init__(catrel, arch, osrel, fn_ts, gencat_bin, chkcat) self.__verbose = verbose def notify(self, date, addr, pkginfo): @@ -26,6 +26,8 @@ parser.add_argument('--os-release', required=True) parser.add_argument('--timestamp-file', default='/var/cache/chkdbcat/timestamp.json') parser.add_argument('--chkcat-path', default='/opt/csw/bin/chkcat') + parser.add_argument('--gen-catalog-path', + help="Path to gen-catalog-index") return parser.parse_args() def main(): @@ -37,6 +39,7 @@ if args.verbose: print("Checking Database Catalog {0} {2} {1}".format(args.catalog_release, args.arch, args.os_release)) with MyCheckDBCatalog(args.catalog_release, args.arch, args.os_release, args.timestamp_file, + args.gen_catalog_path, args.chkcat_path, args.verbose) as checker: success = checker.check() if args.verbose: Modified: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-05 20:05:52 UTC (rev 23335) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-05 21:33:27 UTC (rev 23336) @@ -11,6 +11,7 @@ import datetime import dateutil.parser import logging +import os import os.path import shutil import subprocess @@ -20,7 +21,6 @@ from lib.python import configuration from lib.python.shell import ShellCommand from lib.python.rest import RestClient, GetUsernameAndPassword -from lib.python.generate_catalog_file import CatalogFileGenerator class FSLock(object): """Simple Lock class @@ -43,6 +43,37 @@ os.rmdir(self.__dirname) +class GenerateCatalog(object): + """Dumping a database catalog to disk in a format digestable for chkcat. + + Replacement for lib.python.generate_catalog_file + + """ + + def __init__(self, catrel, + arch, + osrel, + catgenbin): + self._catrel = catrel + self._arch = arch + self._osrel = osrel + self._catgenbin = catgenbin + + def generate_catalog(self, catalogdir): + """Generate the catalog and place it to :param catalogdir:""" + logging.debug("Generate catalog %s %s %s using %s/catalog", self._catrel, + self._osrel, + self._arch, + self._catgenbin) + + (retval, + wdc1, + wdc2) = ShellCommand([self._catgenbin, + "-arch", self._arch, + "-catalog-release", self._catrel, + "-os-release", self._osrel, + "-output", os.path.join(catalogdir, "catalog")]) + class TimestampRecord(object): """Record Timestamp for a given Catalog, Architecture, and OS Release into a json encoded file.""" def __init__(self, fn): @@ -268,13 +299,16 @@ removed by __exit__(). """ - def __init__(self, catrel, arch, osrel, fn_ts, chkcat="/opt/csw/bin/chkcat", + def __init__(self, catrel, arch, osrel, fn_ts, gen_catalog_bin, + chkcat="/opt/csw/bin/chkcat", cattiming_class=CatalogTiming, tsrecord_class=TimestampRecord): """Constructor. "fn_ts" is the path name to the time stamp file. + "gen_catalog_bin" is the path to the gen-catalog-index binary + "chkcat" is the path to `chkcat'. By default `/opt/csw/bin/chkcat'. @@ -291,8 +325,8 @@ username=username, password=password) - self.__catalogfgen = CatalogFileGenerator( - catrel, arch, osrel, self.rest_client) + self.__catalogfgen = GenerateCatalog(catrel, arch, osrel, + gen_catalog_bin) self.__chkcat = chkcat # store for later use @@ -348,7 +382,7 @@ def fetch_db_cat(self): """Fetch catalog stored in database into temporary direcotry.""" assert self.tmpdir is not None - self.__catalogfgen.GenerateCatalog(self.tmpdir) + self.__catalogfgen.generate_catalog(self.tmpdir) def run_chkcat(self): """Run `chkcat' on catalog retrieved into temporary directory.""" Modified: csw/mgar/gar/v2/lib/python/chkdbcat_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2014-04-05 20:05:52 UTC (rev 23335) +++ csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2014-04-05 21:33:27 UTC (rev 23336) @@ -240,7 +240,7 @@ ] } } - + def notify(self, date, addr, pkginfo): assert date == self.expected_notification_on[addr]['lastsuccessful'] @@ -253,20 +253,28 @@ for p in pkginfo: assert p['fullname'] in self.expected_notification_on[addr]['newpkgs'] - + def setUp(self): self.__timestamp_file = '/tmp/TestCheckDBCatalog.ts' def test_InvalidCatalog(self): """Test a locally generated invalid catalog""" - - with self.TCheckDBCatalogInvalid('unstable','sparc','SunOS5.10', self.__timestamp_file, cattiming_class=TCatalogTiming) as test: + + with self.TCheckDBCatalogInvalid('unstable', 'sparc', + 'SunOS5.10', + self.__timestamp_file, + 'go/bin/gen-catalog-index', + cattiming_class=TCatalogTiming) as test: self.assertFalse(test.check()) def test_ValidCatalog(self): """Test a locally generated valid catalog""" - with self.TCheckDBCatalogValid('unstable','sparc','SunOS5.10', self.__timestamp_file, cattiming_class=TCatalogTiming) as test: + with self.TCheckDBCatalogValid('unstable', 'sparc', + 'SunOS5.10', + self.__timestamp_file, + 'go/bin/gen-catalog-index', + cattiming_class=TCatalogTiming) as test: self.assertFalse(test.check()) def test_Notification(self): @@ -275,16 +283,20 @@ with TimestampRecord(self.__timestamp_file) as tsobj: tsobj.set('unstable','sparc','SunOS5.10',datetime.datetime(2013,5,17,0,0,0)) - with self.TCheckDBCatalogNotification('unstable', 'sparc', 'SunOS5.10', self.__timestamp_file, cattiming_class=TCatalogTiming) as test: + with self.TCheckDBCatalogNotification('unstable', 'sparc', + 'SunOS5.10', + self.__timestamp_file, + 'go/bin/gen-catalog-index', + cattiming_class=TCatalogTiming) as test: self.assertFalse(test.check()) def tearDown(self): try: os.unlink(self.__timestamp_file) except: - pass - + pass + if __name__ == '__main__': logging.basicConfig(level=logging.INFO) unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 00:08:36 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 22:08:36 +0000 Subject: SF.net SVN: gar:[23337] csw/mgar/gar/v2/go/src Message-ID: <3g1XGz211DzVt@mail.opencsw.org> Revision: 23337 http://sourceforge.net/p/gar/code/23337 Author: wahwah Date: 2014-04-05 22:08:35 +0000 (Sat, 05 Apr 2014) Log Message: ----------- catalog-release-to-disk: Beter doc strings Add comments on top of the files. Modified Paths: -------------- csw/mgar/gar/v2/go/src/catalog-release-to-disk/catalog-release-to-disk.go csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go Modified: csw/mgar/gar/v2/go/src/catalog-release-to-disk/catalog-release-to-disk.go =================================================================== --- csw/mgar/gar/v2/go/src/catalog-release-to-disk/catalog-release-to-disk.go 2014-04-05 21:33:27 UTC (rev 23336) +++ csw/mgar/gar/v2/go/src/catalog-release-to-disk/catalog-release-to-disk.go 2014-04-05 22:08:35 UTC (rev 23337) @@ -1,13 +1,12 @@ -// Generate OpenCSW catalog - symlinks and hardlinks on disk +// Command catalog-release to disk obtains catalog contents via the OpenCSW +// REST interface on the buildfarm, analyzes the state state of the +// filesystem, and performs the necessary operations to bring the catalog on +// disk to the state defined in the database. // -// Obtains catalog contents via a REST interface, analyzes the disk state, and -// only performs the necessary operations. +// Building this program: See README in the go/ directory. // -// Building this program: See README in the go/ directory -// // As of 2014-03-16, this program is not packaged, but instead simply compiled // and put in place. - package main import ( Modified: csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go =================================================================== --- csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go 2014-04-05 21:33:27 UTC (rev 23336) +++ csw/mgar/gar/v2/go/src/gen-catalog-index/gen-catalog-index.go 2014-04-05 22:08:35 UTC (rev 23337) @@ -1,3 +1,8 @@ +// Command gen-catalog-index genereates a catalog index file as described on +// http://www.opencsw.org/manual/for-maintainers/catalog-format.html -- the +// same code is used in the larger catalog generation program. This standalone +// utility is used to generate on-disk catalogs for other purposes like +// catalog checking. package main import ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 00:09:12 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 5 Apr 2014 22:09:12 +0000 Subject: SF.net SVN: gar:[23338] csw/mgar/gar/v2/lib/python/package_age.py Message-ID: <3g1XHf1NLGzYN@mail.opencsw.org> Revision: 23338 http://sourceforge.net/p/gar/code/23338 Author: wahwah Date: 2014-04-05 22:09:11 +0000 (Sat, 05 Apr 2014) Log Message: ----------- package-age: Comments how to generate the hist It's fiddly to generate the X axis labels. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_age.py Modified: csw/mgar/gar/v2/lib/python/package_age.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_age.py 2014-04-05 22:08:35 UTC (rev 23337) +++ csw/mgar/gar/v2/lib/python/package_age.py 2014-04-05 22:09:11 UTC (rev 23338) @@ -3,6 +3,17 @@ """Download and generate package age dataset for analysis with R. It's a toy as of 2014-04-05. + +To draw a histogram of package ages, run this in R: + +data <- read.table(file="/media/ivy-shared/package-ages.txt", header=TRUE, + colClasses=c("factor", "factor", "Date")) + +png(filename="package-ages.png", width=1024, height=1024) +plot(hist(data$date, breaks="quarters", labels=TRUE, xlab="Quarters", + axes=FALSE), xaxt="n") +axis(1, data$date, format(data$date, "%Y"), cex.axis = 1.7) +dev.off() """ import logging This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 6 09:41:27 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 6 Apr 2014 07:41:27 +0000 Subject: SF.net SVN: gar:[23339] csw/mgar/gar/v2 Message-ID: <3g1mzz5fWgztH@mail.opencsw.org> Revision: 23339 http://sourceforge.net/p/gar/code/23339 Author: guengel Date: 2014-04-06 07:41:26 +0000 (Sun, 06 Apr 2014) Log Message: ----------- Does now send mails to maintainers which might have caused db catalog corruption. Modified Paths: -------------- csw/mgar/gar/v2/bin/chkdbcat csw/mgar/gar/v2/lib/python/chkdbcat.py csw/mgar/gar/v2/lib/python/chkdbcat_test.py Modified: csw/mgar/gar/v2/bin/chkdbcat =================================================================== --- csw/mgar/gar/v2/bin/chkdbcat 2014-04-05 22:09:11 UTC (rev 23338) +++ csw/mgar/gar/v2/bin/chkdbcat 2014-04-06 07:41:26 UTC (rev 23339) @@ -4,6 +4,7 @@ import argparse import logging from lib.python import chkdbcat +import smtplib class MyCheckDBCatalog(chkdbcat.CheckDBCatalog): """Class overriding CheckDBCatalog.notify()""" @@ -12,9 +13,9 @@ self.__verbose = verbose def notify(self, date, addr, pkginfo): - # TODO: Do actual notification. To be discussed. - if self.__verbose: print('Notify %s' % addr) - print(date, add, pkginfo) + notifier = chkdbcat.InformMaintainer((self._catrel, self._osrel, self._arch), + date, addr, pkginfo)) + notfier.send_mail() def argparser(): Modified: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-05 22:09:11 UTC (rev 23338) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 07:41:26 UTC (rev 23339) @@ -7,6 +7,7 @@ Notifications for invalid catalogs can be customized by overriding CheckDBCat.notify(). """ +from email.mime.text import MIMEText import cjson import datetime import dateutil.parser @@ -14,6 +15,7 @@ import os import os.path import shutil +import smtplib import subprocess import sys import tempfile @@ -330,9 +332,9 @@ self.__chkcat = chkcat # store for later use - self.__catrel = catrel - self.__arch = arch - self.__osrel = osrel + self._catrel = catrel + self._arch = arch + self._osrel = osrel # will be set by __enter__ and unset by __exit__ self.tmpdir = None @@ -415,9 +417,9 @@ # Only record successful checks. if retval: with self.__timestamp_record: - self.__timestamp_record.set(self.__catrel, - self.__arch, - self.__osrel, + self.__timestamp_record.set(self._catrel, + self._arch, + self._osrel, datetime.datetime.now()) # Compose list of packages uploaded since last successful @@ -425,18 +427,18 @@ notifications = {} if not retval: lastsuccessful = self.__timestamp_record.get( - self.__catrel, - self.__arch, - self.__osrel) + self._catrel, + self._arch, + self._osrel) if lastsuccessful is None: logging.warn("No successful catalog check recorded for %s,%s,%s" % - (self.__catrel, self.__arch, self.__osrel)) + (self._catrel, self._arch, self._osrel)) return retval; - newpkgs = self.__cattiming_class(self.__catrel, - self.__arch, - self.__osrel).upload_newer_than(lastsuccessful) + newpkgs = self.__cattiming_class(self._catrel, + self._arch, + self._osrel).upload_newer_than(lastsuccessful) # compose notifications list in a manner so that # each email address is notified exactly once, even @@ -451,3 +453,57 @@ self.notify(notifications[n]['lastsuccessful'], n, notifications[n]['newpkgs']) return retval + + +class InformMaintainer(object): + MAIL_CAT_BROKEN_HEADER = u"""Hi + +You uploaded following packages + +""" + + MAIL_CAT_BROKEN_FOOTER = u""" +which may (or may not) have broken the catalog for + + %s %s %s + +since the last successful check on %s. + +Please check the package(s) and re-upload if necessary. + +Your Check Database Catalog script + +""" + + def __init__(self, cat_tuple, date, addr, pkginfo): + self._cat_tuple = cat_tuple + self._date = date + self._addr = addr + self._pkginfo = pkginfo + + def _compose_mail(self, from_address): + """Compose Mail""" + + msg = InformMaintainer.MAIL_CAT_BROKEN_HEADER + for p in self._pkginfo: + msg = msg + p['fullname'] + "\n" + msg = msg + InformMaintainer.MAIL_CAT_BROKEN_FOOTER + + mail = MIMEText(msg % (self._cat_tuple + (str(self._date),))) + mail['From'] = from_address + mail['To'] = self._addr + + return mail + + def send_mail(self): + from_address = "Check Database Catalog " + s = smtplib.SMTP('mail.opencsw.org') + try: + s.sendmail(from_address, [self._addr], + self._compose_mail(from_address).as_string()) + logging.debug("E-mail sending finished.") + except smtplib.SMTPRecipientsRefused, e: + logging.error( + "Sending email to %s failed, recipient refused.", + repr(self._addr)) + Modified: csw/mgar/gar/v2/lib/python/chkdbcat_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2014-04-05 22:09:11 UTC (rev 23338) +++ csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2014-04-06 07:41:26 UTC (rev 23339) @@ -7,7 +7,7 @@ import datetime import logging import unittest -from lib.python.chkdbcat import TimestampRecord, CatalogTiming, CheckDBCatalog +from lib.python.chkdbcat import TimestampRecord, CatalogTiming, CheckDBCatalog, InformMaintainer ## ## Unit tests @@ -254,7 +254,11 @@ for p in pkginfo: assert p['fullname'] in self.expected_notification_on[addr]['newpkgs'] + mail = InformMaintainer((self._catrel, self._osrel, self._arch), + date, addr, pkginfo) + print mail._compose_mail('TestScript') + def setUp(self): self.__timestamp_file = '/tmp/TestCheckDBCatalog.ts' 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 Apr 6 10:02:15 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:02:15 +0000 Subject: SF.net SVN: gar:[23340] csw/mgar/pkg/openvpn/trunk Message-ID: <3g1nS20PhVzyD@mail.opencsw.org> Revision: 23340 http://sourceforge.net/p/gar/code/23340 Author: dmichelsen Date: 2014-04-06 08:02:13 +0000 (Sun, 06 Apr 2014) Log Message: ----------- openvpn/trunk: Reorganize to latest standards Modified Paths: -------------- csw/mgar/pkg/openvpn/trunk/Makefile csw/mgar/pkg/openvpn/trunk/checksums Modified: csw/mgar/pkg/openvpn/trunk/Makefile =================================================================== --- csw/mgar/pkg/openvpn/trunk/Makefile 2014-04-06 07:41:26 UTC (rev 23339) +++ csw/mgar/pkg/openvpn/trunk/Makefile 2014-04-06 08:02:13 UTC (rev 23340) @@ -9,12 +9,19 @@ # master files MASTER_SITES = http://openvpn.net/release/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += patch.openvpn-2.0.9.tun.c -# we require -BUILD_DEP_PKGS = CSWtun -RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWliblzo2-2 +VENDOR_URL = http://openvpn.net +BUILD_DEP_PKGS += CSWtun + +PACKAGES += CSWopenvpn +SPKG_DESC_CSWopenvpn = Secure IP tunnel daemon +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWopenvpn += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWopenvpn += CSWliblzo2-2 + # The references are located in document or sample files and are harmless CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/openvpn/easy-rsa/vars CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/openvpn/easy-rsa/2.0/vars @@ -29,14 +36,13 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = --prefix=$(prefix) --mandir=/opt/csw/share/man -PATCHFILES = patch.openvpn-2.0.9.tun.c # use classes for install/removal #PRESERVECONF = $(sysconfdir)/$(NAME)/$(NAME).conf INITSMF = /etc/opt/csw/init.d/cswopenvpn # no build tests -SKIPTEST = 1 +TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/openvpn/trunk/checksums =================================================================== --- csw/mgar/pkg/openvpn/trunk/checksums 2014-04-06 07:41:26 UTC (rev 23339) +++ csw/mgar/pkg/openvpn/trunk/checksums 2014-04-06 08:02:13 UTC (rev 23340) @@ -1,2 +1 @@ -60745008b90b7dbe25fe8337c550fec6 download/openvpn-2.0.9.tar.gz -1c9565b3212299c029821f1753138972 download/patch.openvpn-2.0.9.tun.c +60745008b90b7dbe25fe8337c550fec6 openvpn-2.0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 6 10:07:25 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:07:25 +0000 Subject: SF.net SVN: gar:[23341] csw/mgar/gar/v2/lib/python/chkdbcat.py Message-ID: <3g1nYs57cdz12t@mail.opencsw.org> Revision: 23341 http://sourceforge.net/p/gar/code/23341 Author: guengel Date: 2014-04-06 08:07:24 +0000 (Sun, 06 Apr 2014) Log Message: ----------- Letting the mail have a subject is a nice idea. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/chkdbcat.py Modified: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 08:02:13 UTC (rev 23340) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 08:07:24 UTC (rev 23341) @@ -492,6 +492,7 @@ mail = MIMEText(msg % (self._cat_tuple + (str(self._date),))) mail['From'] = from_address mail['To'] = self._addr + mail['Subject'] = "[chkdbcat] Database Catalog broken by recent upload" return mail 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 Apr 6 10:10:18 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:10:18 +0000 Subject: SF.net SVN: gar:[23342] csw/mgar/pkg/proxytunnel/trunk Message-ID: <3g1ndD1dFMz16N@mail.opencsw.org> Revision: 23342 http://sourceforge.net/p/gar/code/23342 Author: dmichelsen Date: 2014-04-06 08:10:16 +0000 (Sun, 06 Apr 2014) Log Message: ----------- proxytunnel/trunk: Update to latest standards Modified Paths: -------------- csw/mgar/pkg/proxytunnel/trunk/Makefile csw/mgar/pkg/proxytunnel/trunk/checksums Modified: csw/mgar/pkg/proxytunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/proxytunnel/trunk/Makefile 2014-04-06 08:07:24 UTC (rev 23341) +++ csw/mgar/pkg/proxytunnel/trunk/Makefile 2014-04-06 08:10:16 UTC (rev 23342) @@ -11,29 +11,29 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tgz +DISTFILES += $(DISTNAME).tgz +DISTFILES += changelog.CSW PATCHFILES = patch-Makefile.diff -SPKG_SOURCEURL = http://proxytunnel.sourceforge.net/ +VENDOR_URL = http://proxytunnel.sourceforge.net/ -BUILD_DEP_PKGS = CSWlibssl-dev -RUNTIME_DEP_PKGS = CSWlibssl1-0-0 +BUILD_DEP_PKGS += CSWlibssl-dev -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz -# UPSTREAM_MASTER_SITES = +PACKAGES += CSWproxytunnel +SPKG_DESC_CSWproxytunnel = Tunnels network connections through a HTTPS proxy +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWproxytunnel = CSWlibssl1-0-0 CONFIGURE_SCRIPTS = TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CFLAGS += -I$(includedir) +EXTRA_LDFLAGS += -lnsl -lsocket -EXTRA_CFLAGS = -I/opt/csw/include -EXTRA_LDFLAGS = -lnsl -lsocket - include gar/category.mk post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) post-install-modulated: @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @cp $(WORKDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/proxytunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/proxytunnel/trunk/checksums 2014-04-06 08:07:24 UTC (rev 23341) +++ csw/mgar/pkg/proxytunnel/trunk/checksums 2014-04-06 08:10:16 UTC (rev 23342) @@ -1,2 +1 @@ -d74472b89c3f3b3b0abf6bd809ae34c2 download/proxytunnel-1.9.0.tgz -b964acf679e2ea3a24fda6ea67f36581 download/patch-Makefile.diff +d74472b89c3f3b3b0abf6bd809ae34c2 proxytunnel-1.9.0.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 10:11:21 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:11:21 +0000 Subject: SF.net SVN: gar:[23343] csw/mgar/pkg/libldns/trunk Message-ID: <3g1nfQ5mtXz19h@mail.opencsw.org> Revision: 23343 http://sourceforge.net/p/gar/code/23343 Author: idogan23 Date: 2014-04-06 08:11:19 +0000 (Sun, 06 Apr 2014) Log Message: ----------- libldns1: bump version to 1.6.17 Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile csw/mgar/pkg/libldns/trunk/checksums Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2014-04-06 08:10:16 UTC (rev 23342) +++ csw/mgar/pkg/libldns/trunk/Makefile 2014-04-06 08:11:19 UTC (rev 23343) @@ -1,5 +1,5 @@ NAME = ldns -VERSION = 1.6.13 +VERSION = 1.6.17 GARTYPE = v2 DESCRIPTION = A library for programs conforming to DNS RFCs and drafts @@ -44,7 +44,7 @@ INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWldnsdevel -PATCHFILES = CSWldns.doxyparse.diff +#PATCHFILES = CSWldns.doxyparse.diff CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw Modified: csw/mgar/pkg/libldns/trunk/checksums =================================================================== --- csw/mgar/pkg/libldns/trunk/checksums 2014-04-06 08:10:16 UTC (rev 23342) +++ csw/mgar/pkg/libldns/trunk/checksums 2014-04-06 08:11:19 UTC (rev 23343) @@ -1 +1 @@ -bcada4f2e62aa40fcdd5d73aec46f284 ldns-1.6.13.tar.gz +a79423bcc4129e6d59b616b1cae11e5e ldns-1.6.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 6 10:16:53 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:16:53 +0000 Subject: SF.net SVN: gar:[23344] csw/mgar/pkg/htmldoc/trunk Message-ID: <3g1nmr12vWz1Fl@mail.opencsw.org> Revision: 23344 http://sourceforge.net/p/gar/code/23344 Author: dmichelsen Date: 2014-04-06 08:16:52 +0000 (Sun, 06 Apr 2014) Log Message: ----------- htmldoc/trunk: Update to latest standards Modified Paths: -------------- csw/mgar/pkg/htmldoc/trunk/Makefile csw/mgar/pkg/htmldoc/trunk/checksums Modified: csw/mgar/pkg/htmldoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/htmldoc/trunk/Makefile 2014-04-06 08:11:19 UTC (rev 23343) +++ csw/mgar/pkg/htmldoc/trunk/Makefile 2014-04-06 08:16:52 UTC (rev 23344) @@ -9,50 +9,36 @@ HTML 3.2 and some HTML 4.0 syntax, as well as GIF, JPEG, and PNG images. endef -PACKAGES = CSWhtmldoc-common CSWhtmldoc -CATALOGNAME_CSWhtmldoc = $(NAME) -CATALOGNAME_CSWhtmldoc-common = $(NAME)_common -SPKG_DESC_CSWhtmldoc = $(DESCRIPTION) -SPKG_DESC_CSWhtmldoc-common = This package contains the htmldoc files common to all architectures. -ARCHALL_CSWhtmldoc-common = 1 +MASTER_SITES += http://www.msweet.org/files/project1/ +DISTFILES += $(DISTNAME)-source.tar.bz2 -RUNTIME_DEP_PKGS_CSWhtmldoc = CSWfltk CSWlibjpeg7 CSWlibssl1-0-0 CSWlibpng15-15 CSWlibz1 -RUNTIME_DEP_PKGS_CSWhtmldoc += CSWhtmldoc-common -#RUNTIME_DEP_PKGS_CSWhtmldoc-common = +PATCHFILES += mainpatch +PATCHFILES += 0002-libpng15-compatibility-fix.patch -CHECKPKG_OVERRIDES_CSWhtmldoc += surplus-dependency|CSWhtmldoc-common +VENDOR_URL = http://www.htmldoc.org +LICENSE = COPYING.txt + +PACKAGES += CSWhtmldoc-common +SPKG_DESC_CSWhtmldoc-common = This package contains the htmldoc files common to all architectures +# PKGFILES is catchall +ARCHALL_CSWhtmldoc-common = 1 CHECKPKG_OVERRIDES_CSWhtmldoc-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/htmldoc.1 +PACKAGES += CSWhtmldoc +SPKG_DESC_CSWhtmldoc = $(DESCRIPTION) PKGFILES_CSWhtmldoc = $(bindir)/.* -PKGFILES_CSWhtmldoc-common = $(datadir)/.* +RUNTIME_DEP_PKGS_CSWhtmldoc += CSWfltk +RUNTIME_DEP_PKGS_CSWhtmldoc += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWhtmldoc += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWhtmldoc += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWhtmldoc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWhtmldoc += CSWhtmldoc-common +CHECKPKG_OVERRIDES_CSWhtmldoc += surplus-dependency|CSWhtmldoc-common -MASTER_SITES = http://ftp.easysw.com/pub/htmldoc/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION)-source.tar.bz2 -#DISTFILES += $(call admfiles,CSWhtmldoc, ) -#DISTFILES += $(call admfiles,CSWhtmldoc-common, ) - -LICENSE = COPYING.txt - -SPKG_SOURCEURL = http://www.htmldoc.org - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-source.tar.bz2 - -# 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 = - -PATCHFILES = mainpatch - -PATCHFILES += 0002-libpng15-compatibility-fix.patch - -CONFIGURE_ARGS = $(DIRPATHS) - +# There is no testsuite TEST_SCRIPTS = -# Disable check until package is released -#ENABLE_CHECK = 0 include gar/category.mk post-configure: Modified: csw/mgar/pkg/htmldoc/trunk/checksums =================================================================== --- csw/mgar/pkg/htmldoc/trunk/checksums 2014-04-06 08:11:19 UTC (rev 23343) +++ csw/mgar/pkg/htmldoc/trunk/checksums 2014-04-06 08:16:52 UTC (rev 23344) @@ -1,2 +1 @@ 35589e7b8fe9c54e11be87cd5aec4dcc htmldoc-1.8.27-source.tar.bz2 -b44e823414126306dd5c8d222065e00c mainpatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 6 10:28:06 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:28:06 +0000 Subject: SF.net SVN: gar:[23345] csw/mgar/gar/v2/lib/python Message-ID: <3g1p1l656Gz1Kp@mail.opencsw.org> Revision: 23345 http://sourceforge.net/p/gar/code/23345 Author: guengel Date: 2014-04-06 08:28:04 +0000 (Sun, 06 Apr 2014) Log Message: ----------- Include stdout and stderr from chkcat. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/chkdbcat.py csw/mgar/gar/v2/lib/python/chkdbcat_test.py Modified: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 08:16:52 UTC (rev 23344) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 08:28:04 UTC (rev 23345) @@ -450,7 +450,7 @@ notifications[addr].setdefault('newpkgs', []).append(np) for n in notifications: - self.notify(notifications[n]['lastsuccessful'], n, notifications[n]['newpkgs']) + self.notify(notifications[n]['lastsuccessful'], n, notifications[n]['newpkgs'], self.stdout, self.stderr) return retval @@ -471,15 +471,23 @@ Please check the package(s) and re-upload if necessary. +Here is the output from chkcat: + +%s + +%s + Your Check Database Catalog script """ - def __init__(self, cat_tuple, date, addr, pkginfo): + def __init__(self, cat_tuple, date, addr, pkginfo, chkcat_stdout, chkcat_stderr): self._cat_tuple = cat_tuple self._date = date self._addr = addr self._pkginfo = pkginfo + self._chkcat_stdout = chkcat_stdout + self._chkcat_stderr = chkcat_stderr def _compose_mail(self, from_address): """Compose Mail""" @@ -489,7 +497,8 @@ msg = msg + p['fullname'] + "\n" msg = msg + InformMaintainer.MAIL_CAT_BROKEN_FOOTER - mail = MIMEText(msg % (self._cat_tuple + (str(self._date),))) + mail = MIMEText(msg % (self._cat_tuple + + (str(self._date), self._chkcat_stdout, self._chkcat_stderr))) mail['From'] = from_address mail['To'] = self._addr mail['Subject'] = "[chkdbcat] Database Catalog broken by recent upload" Modified: csw/mgar/gar/v2/lib/python/chkdbcat_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2014-04-06 08:16:52 UTC (rev 23344) +++ csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2014-04-06 08:28:04 UTC (rev 23345) @@ -241,7 +241,7 @@ } } - def notify(self, date, addr, pkginfo): + def notify(self, date, addr, pkginfo, chkcat_stdout, chkcat_stderr): assert date == self.expected_notification_on[addr]['lastsuccessful'] if addr == "raos at opencsw.org": @@ -255,7 +255,7 @@ assert p['fullname'] in self.expected_notification_on[addr]['newpkgs'] mail = InformMaintainer((self._catrel, self._osrel, self._arch), - date, addr, pkginfo) + date, addr, pkginfo, chkcat_stdout, chkcat_stderr) print mail._compose_mail('TestScript') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 10:33:52 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:33:52 +0000 Subject: SF.net SVN: gar:[23346] csw/mgar/pkg/nsd/trunk Message-ID: <3g1p8Q1Lmcz1PN@mail.opencsw.org> Revision: 23346 http://sourceforge.net/p/gar/code/23346 Author: idogan23 Date: 2014-04-06 08:33:51 +0000 (Sun, 06 Apr 2014) Log Message: ----------- nsd: bump version to 4.0.3 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2014-04-06 08:28:04 UTC (rev 23345) +++ csw/mgar/pkg/nsd/trunk/Makefile 2014-04-06 08:33:51 UTC (rev 23346) @@ -1,5 +1,5 @@ NAME = nsd -VERSION = 3.2.16 +VERSION = 4.0.3 GARTYPE = v2 DESCRIPTION = An authoritative only non-recursive name server @@ -19,7 +19,8 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWnsd -RUNTIME_DEP_PKGS = CSWlibssl1-0-0 +RUNTIME_DEP_PKGS = CSWlibssl1-0-0 +RUNTIME_DEP_PKGS += CSWlibevent2-0-5 CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -34,6 +35,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-libevent=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/nsd.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --with-dbfile=/var/opt/csw/nsd/nsd.db @@ -42,6 +44,8 @@ SKIPTEST = 1 +#CHECKPKG_OVERRIDES_CSWnsd += bad-location-of-file|file=/tmp + post-install-modulated: @ginstall -d $(DESTDIR)/var/opt/csw/nsd @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @@ -49,5 +53,6 @@ @ginstall -m 755 $(FILEDIR)/cswnsd $(DESTDIR)/etc/opt/csw/init.d/cswnsd @mv $(DESTDIR)/etc/opt/csw/nsd/nsd.conf.sample $(DESTDIR)/etc/opt/csw/nsd/nsd.conf.CSW @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWnsd/cswusergroup + @rmdir $(DESTDIR)/tmp include gar/category.mk Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2014-04-06 08:28:04 UTC (rev 23345) +++ csw/mgar/pkg/nsd/trunk/checksums 2014-04-06 08:33:51 UTC (rev 23346) @@ -1 +1 @@ -c16a845884851d26c85d5117f11e5f08 nsd-3.2.16.tar.gz +9331dd18478295206775433a0b23e490 nsd-4.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 6 10:52:59 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 6 Apr 2014 08:52:59 +0000 Subject: SF.net SVN: gar:[23347] csw/mgar/pkg/gnome-base/libgnomeprint Message-ID: <3g1pZR12gqz1TR@mail.opencsw.org> Revision: 23347 http://sourceforge.net/p/gar/code/23347 Author: dmichelsen Date: 2014-04-06 08:52:57 +0000 (Sun, 06 Apr 2014) Log Message: ----------- gnome-base/libgnomeprint: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/gnome-base/libgnomeprint/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 6 11:24:57 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 6 Apr 2014 09:24:57 +0000 Subject: SF.net SVN: gar:[23348] csw/mgar/gar/v2/lib/python/chkdbcat.py Message-ID: <3g1qHM2xnwz20@mail.opencsw.org> Revision: 23348 http://sourceforge.net/p/gar/code/23348 Author: guengel Date: 2014-04-06 09:24:55 +0000 (Sun, 06 Apr 2014) Log Message: ----------- Information mail will now be composed using cheetah templates. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/chkdbcat.py Modified: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 08:52:57 UTC (rev 23347) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2014-04-06 09:24:55 UTC (rev 23348) @@ -8,6 +8,7 @@ CheckDBCat.notify(). """ from email.mime.text import MIMEText +from Cheetah import Template import cjson import datetime import dateutil.parser @@ -456,27 +457,30 @@ class InformMaintainer(object): - MAIL_CAT_BROKEN_HEADER = u"""Hi + """Inform maintainers about broken database catalog + """ + + MAIL_TEMPLATE = u"""Hi there + You uploaded following packages -""" +#for pkg in $pkg_data + * $pkg["fullname"] +#end for - MAIL_CAT_BROKEN_FOOTER = u""" which may (or may not) have broken the catalog for - %s %s %s + $catrel[0] $catrel[1] $catrel[2] -since the last successful check on %s. +since the last successful check on $date. Please check the package(s) and re-upload if necessary. Here is the output from chkcat: -%s +$stdout -%s - Your Check Database Catalog script """ @@ -492,13 +496,16 @@ def _compose_mail(self, from_address): """Compose Mail""" - msg = InformMaintainer.MAIL_CAT_BROKEN_HEADER - for p in self._pkginfo: - msg = msg + p['fullname'] + "\n" - msg = msg + InformMaintainer.MAIL_CAT_BROKEN_FOOTER + namespace = { + 'pkg_data': self._pkginfo, + 'catrel': self._cat_tuple, + 'date': self._date, + 'stdout': self._chkcat_stdout + } - mail = MIMEText(msg % (self._cat_tuple + - (str(self._date), self._chkcat_stdout, self._chkcat_stderr))) + t = Template.Template(InformMaintainer.MAIL_TEMPLATE, searchList=[namespace]) + + mail = MIMEText(unicode(t)) mail['From'] = from_address mail['To'] = self._addr mail['Subject'] = "[chkdbcat] Database Catalog broken by recent upload" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 11:47:15 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 09:47:15 +0000 Subject: SF.net SVN: gar:[23349] csw/mgar/pkg/nsd/trunk/files/cswnsd Message-ID: <3g1qn41LDjz6d@mail.opencsw.org> Revision: 23349 http://sourceforge.net/p/gar/code/23349 Author: idogan23 Date: 2014-04-06 09:47:14 +0000 (Sun, 06 Apr 2014) Log Message: ----------- nsd: Init script adapted to nsd 4.x, as nsdc is no longer available Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/files/cswnsd Modified: csw/mgar/pkg/nsd/trunk/files/cswnsd =================================================================== --- csw/mgar/pkg/nsd/trunk/files/cswnsd 2014-04-06 09:24:55 UTC (rev 23348) +++ csw/mgar/pkg/nsd/trunk/files/cswnsd 2014-04-06 09:47:14 UTC (rev 23349) @@ -3,14 +3,11 @@ case "$1" in start) echo "Starting nsd." - if [ ! -f /var/opt/csw/nsd/nsd.db ]; then - /opt/csw/sbin/nsdc rebuild >/dev/null 2>/dev/null - fi - /opt/csw/sbin/nsdc start + /opt/csw/sbin/nsd-control start ;; stop) echo "Stopping nsd." - /opt/csw/sbin/nsdc stop + /usr/bin/kill -TERM `cat /var/run/nsd.pid` ;; restart) $0 stop @@ -19,7 +16,7 @@ ;; refresh) echo "Refreshing nsd." - /opt/csw/sbin/nsdc reload + /usr/bin/kill -HUP `cat /var/run/nsd.pid` ;; *) echo "Usage: $0 { start | stop | restart | refresh }" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 12:01:38 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 10:01:38 +0000 Subject: SF.net SVN: gar:[23350] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: <3g1r5g43mPzBt@mail.opencsw.org> Revision: 23350 http://sourceforge.net/p/gar/code/23350 Author: idogan23 Date: 2014-04-06 10:01:34 +0000 (Sun, 06 Apr 2014) Log Message: ----------- libldns1: moved to dev package Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2014-04-06 09:47:14 UTC (rev 23349) +++ csw/mgar/pkg/libldns/trunk/Makefile 2014-04-06 10:01:34 UTC (rev 23350) @@ -17,13 +17,13 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PACKAGES = CSWlibldns1 CSWlibldns-devel -CATALOGNAME_CSWlibldns1 = libldns1 -CATALOGNAME_CSWlibldns-devel = libldns_devel +PACKAGES = CSWlibldns1 CSWlibldns-dev SPKG_DESC_CSWlibldns1 = $(DESCRIPTION) -SPKG_DESC_CSWlibldns-devel = $(DESCRIPTION) development package +SPKG_DESC_CSWlibldns-dev = $(DESCRIPTION) development package +OBSOLETED_BY_CSWlibldns-dev += CSWlibldns-devel + SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ # We define upstream file regex so we can be notifed of new upstream software release @@ -39,7 +39,7 @@ EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis RUNTIME_DEP_PKGS_CSWlibldns1 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibldns-devel += CSWlibldns1 +RUNTIME_DEP_PKGS_CSWlibldns-dev += CSWlibldns1 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWldnsdevel @@ -55,7 +55,6 @@ TEST_TARGET = -PKGFILES_CSWlibldns-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibldnsrt = $(PKGFILES_RT) +PKGFILES_CSWlibldns-dev = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 12:10:19 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 10:10:19 +0000 Subject: SF.net SVN: gar:[23351] csw/mgar/pkg/socat/trunk Message-ID: <3g1rHj6Bt6zGT@mail.opencsw.org> Revision: 23351 http://sourceforge.net/p/gar/code/23351 Author: wahwah Date: 2014-04-06 10:10:18 +0000 (Sun, 06 Apr 2014) Log Message: ----------- socat/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/socat/trunk/checksums Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2014-04-06 10:01:34 UTC (rev 23350) +++ csw/mgar/pkg/socat/trunk/Makefile 2014-04-06 10:10:18 UTC (rev 23351) @@ -20,7 +20,7 @@ # Solaris 9 bin bash doesn't support here strings. # NAME = socat -VERSION = 1.7.1.3 +VERSION = 1.7.2.4 GARTYPE = v2 DESCRIPTION = Multipurpose relay for bidirectional data transfer @@ -37,13 +37,12 @@ VENDOR_URL = http://www.dest-unreach.org/socat/ MASTER_SITES = http://www.dest-unreach.org/socat/download/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibreadline6 CSWlibwrap1 # test.sh uses unescaped nested double quotes (doesn't work with /bin/bash) -PATCHFILES += 0001-Escape-nested-double-quotes.patch +# PATCHFILES += 0001-Escape-nested-double-quotes.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/socat/trunk/checksums =================================================================== --- csw/mgar/pkg/socat/trunk/checksums 2014-04-06 10:01:34 UTC (rev 23350) +++ csw/mgar/pkg/socat/trunk/checksums 2014-04-06 10:10:18 UTC (rev 23351) @@ -1 +1 @@ -f5cd212c511725864c4b5e08a22d3366 socat-1.7.1.3.tar.gz +2a15dc3362f49d543abdbacc267d0a41 socat-1.7.2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 12:47:28 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 10:47:28 +0000 Subject: SF.net SVN: gar:[23352] csw/mgar/pkg/sbcl/trunk/Makefile Message-ID: <3g1s6Y1NMXzLw@mail.opencsw.org> Revision: 23352 http://sourceforge.net/p/gar/code/23352 Author: wahwah Date: 2014-04-06 10:47:27 +0000 (Sun, 06 Apr 2014) Log Message: ----------- sbcl/trunk: it builds on intel Modified Paths: -------------- csw/mgar/pkg/sbcl/trunk/Makefile Modified: csw/mgar/pkg/sbcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sbcl/trunk/Makefile 2014-04-06 10:10:18 UTC (rev 23351) +++ csw/mgar/pkg/sbcl/trunk/Makefile 2014-04-06 10:47:27 UTC (rev 23352) @@ -33,6 +33,10 @@ include gar/category.mk +post-extract: + gfind "$(WORKSRC)" -name '*.sh' -exec gsed -e 's+#!/bin/sh+#!/opt/csw/bin/bash+' -i {} \; + @$(MAKECOOKIE) + build-sbcl: (cd $(WORKSRC) && env -i INSTALL_ROOT=$(DESTDIR)$(prefix) $(BUILD_ENV) /opt/csw/bin/bash make.sh) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 6 12:52:14 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 6 Apr 2014 10:52:14 +0000 Subject: SF.net SVN: gar:[23353] csw/mgar/pkg Message-ID: <3g1sD53X2VzQc@mail.opencsw.org> Revision: 23353 http://sourceforge.net/p/gar/code/23353 Author: cgrzemba Date: 2014-04-06 10:52:14 +0000 (Sun, 06 Apr 2014) Log Message: ----------- rinetd/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/rinetd/ csw/mgar/pkg/rinetd/Makefile csw/mgar/pkg/rinetd/branches/ csw/mgar/pkg/rinetd/tags/ csw/mgar/pkg/rinetd/trunk/ csw/mgar/pkg/rinetd/trunk/Makefile csw/mgar/pkg/rinetd/trunk/checksums csw/mgar/pkg/rinetd/trunk/files/ csw/mgar/pkg/rinetd/trunk/files/0001-Makefile.patch Added: csw/mgar/pkg/rinetd/Makefile =================================================================== --- csw/mgar/pkg/rinetd/Makefile (rev 0) +++ csw/mgar/pkg/rinetd/Makefile 2014-04-06 10:52:14 UTC (rev 23353) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/rinetd/trunk =================================================================== --- csw/mgar/pkg/rinetd/trunk 2014-04-06 10:47:27 UTC (rev 23352) +++ csw/mgar/pkg/rinetd/trunk 2014-04-06 10:52:14 UTC (rev 23353) Property changes on: csw/mgar/pkg/rinetd/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/rinetd/trunk/Makefile =================================================================== --- csw/mgar/pkg/rinetd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rinetd/trunk/Makefile 2014-04-06 10:52:14 UTC (rev 23353) @@ -0,0 +1,26 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = rinetd +VERSION = 0.62 +GARTYPE = v2 + +DESCRIPTION = Internet redirection server - port forwarder +define BLURB + Redirects TCP connections from one IP address and port to another. rinetd is a single-process server which handles any number of connections to the address/port pairs specified in the file /etc/rinetd.conf. Since rinetd runs as a single process using nonblocking I/O, it is able to redirect a large number of connections without a severe impact on the machine. This makes it practical to run TCP services on machines inside an IP masquerading firewall. +endef + +MASTER_SITES = http://www.boutell.com/rinetd/http/ +DISTNAME = $(NAME) +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GCC4 + +PATCHFILES += 0001-Makefile.patch +CONFIGURE_SCRIPTS = +SKIPTEST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/rinetd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/rinetd/trunk/checksums =================================================================== --- csw/mgar/pkg/rinetd/trunk/checksums (rev 0) +++ csw/mgar/pkg/rinetd/trunk/checksums 2014-04-06 10:52:14 UTC (rev 23353) @@ -0,0 +1 @@ +28c78bac648971724c46f1a921154c4f rinetd.tar.gz Added: csw/mgar/pkg/rinetd/trunk/files/0001-Makefile.patch =================================================================== --- csw/mgar/pkg/rinetd/trunk/files/0001-Makefile.patch (rev 0) +++ csw/mgar/pkg/rinetd/trunk/files/0001-Makefile.patch 2014-04-06 10:52:14 UTC (rev 23353) @@ -0,0 +1,18 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,9 +1,11 @@ +-CFLAGS=-DLINUX -g ++CFLAGS=-D_XPG6 + + rinetd: rinetd.o match.o +- gcc rinetd.o match.o -o rinetd ++ $(CC) rinetd.o match.o -lnsl -lsocket -o rinetd + + install: rinetd +- install -m 700 rinetd /usr/sbin +- install -m 644 rinetd.8 /usr/man/man8 ++ ginstall -d $(DESTDIR)/$(bindir) ++ ginstall -d $(DESTDIR)/$(mandir)/man8 ++ ginstall -m 700 rinetd $(DESTDIR)/$(bindir) ++ ginstall -m 644 rinetd.8 $(DESTDIR)/$(mandir)/man8 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 12:56:11 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 10:56:11 +0000 Subject: SF.net SVN: gar:[23354] csw/mgar/pkg/unbound/trunk Message-ID: <3g1sJc73RfzVD@mail.opencsw.org> Revision: 23354 http://sourceforge.net/p/gar/code/23354 Author: idogan23 Date: 2014-04-06 10:56:08 +0000 (Sun, 06 Apr 2014) Log Message: ----------- unbound: bump version to 1.4.22 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2014-04-06 10:52:14 UTC (rev 23353) +++ csw/mgar/pkg/unbound/trunk/Makefile 2014-04-06 10:56:08 UTC (rev 23354) @@ -1,5 +1,5 @@ NAME = unbound -VERSION = 1.4.20 +VERSION = 1.4.22 GARTYPE = v2 DESCRIPTION = A validating, recursive, and caching DNS resolver define BLUR Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2014-04-06 10:52:14 UTC (rev 23353) +++ csw/mgar/pkg/unbound/trunk/checksums 2014-04-06 10:56:08 UTC (rev 23354) @@ -1 +1 @@ -1f2d0b490fd7928a708a326beda21948 unbound-1.4.20.tar.gz +59728c74fef8783f8bad1d7451eba97f unbound-1.4.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 12:59:21 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 10:59:21 +0000 Subject: SF.net SVN: gar:[23355] csw/mgar/pkg/ldns_drill/trunk Message-ID: <3g1sNG4mRwzYc@mail.opencsw.org> Revision: 23355 http://sourceforge.net/p/gar/code/23355 Author: idogan23 Date: 2014-04-06 10:59:20 +0000 (Sun, 06 Apr 2014) Log Message: ----------- ldns_drill: bump version to 1.6.17 Modified Paths: -------------- csw/mgar/pkg/ldns_drill/trunk/Makefile csw/mgar/pkg/ldns_drill/trunk/checksums Modified: csw/mgar/pkg/ldns_drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/Makefile 2014-04-06 10:56:08 UTC (rev 23354) +++ csw/mgar/pkg/ldns_drill/trunk/Makefile 2014-04-06 10:59:20 UTC (rev 23355) @@ -1,5 +1,5 @@ NAME = ldns_drill -VERSION = 1.6.13 +VERSION = 1.6.17 GARTYPE = v2 DESCRIPTION = A dig style dnssec aware dns debugging tool (ldns) Modified: csw/mgar/pkg/ldns_drill/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/checksums 2014-04-06 10:56:08 UTC (rev 23354) +++ csw/mgar/pkg/ldns_drill/trunk/checksums 2014-04-06 10:59:20 UTC (rev 23355) @@ -1 +1 @@ -bcada4f2e62aa40fcdd5d73aec46f284 ldns-1.6.13.tar.gz +a79423bcc4129e6d59b616b1cae11e5e ldns-1.6.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 6 13:16:35 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 6 Apr 2014 11:16:35 +0000 Subject: SF.net SVN: gar:[23356] csw/mgar/pkg/389-adminutil/trunk Message-ID: <3g1slc6wBdzf3@mail.opencsw.org> Revision: 23356 http://sourceforge.net/p/gar/code/23356 Author: cgrzemba Date: 2014-04-06 11:16:32 +0000 (Sun, 06 Apr 2014) Log Message: ----------- 389-adminutil/trunk: update version 1.1.20 Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile csw/mgar/pkg/389-adminutil/trunk/checksums Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2014-04-06 10:59:20 UTC (rev 23355) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2014-04-06 11:16:32 UTC (rev 23356) @@ -1,7 +1,7 @@ # $Id$ # NAME = 389-adminutil -VERSION = 1.1.18 +VERSION = 1.1.20 GARTYPE = v2 DESCRIPTION = The enterprise-class Open Source LDAP server, libadminutil, libadmsslutil Modified: csw/mgar/pkg/389-adminutil/trunk/checksums =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/checksums 2014-04-06 10:59:20 UTC (rev 23355) +++ csw/mgar/pkg/389-adminutil/trunk/checksums 2014-04-06 11:16:32 UTC (rev 23356) @@ -1 +1 @@ -7ee4ce3c3e18bcb04c4d075a2bfed6c3 389-adminutil-1.1.18.tar.bz2 +e29a4eee7578ea51f59c0e76c5899377 389-adminutil-1.1.20.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 6 13:22:09 2014 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 6 Apr 2014 11:22:09 +0000 Subject: SF.net SVN: gar:[23357] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: <3g1stz6s1qzl2@mail.opencsw.org> Revision: 23357 http://sourceforge.net/p/gar/code/23357 Author: idogan23 Date: 2014-04-06 11:22:06 +0000 (Sun, 06 Apr 2014) Log Message: ----------- unbound: Removed not needed deps and patches Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2014-04-06 11:16:32 UTC (rev 23356) +++ csw/mgar/pkg/unbound/trunk/Makefile 2014-04-06 11:22:06 UTC (rev 23357) @@ -20,7 +20,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES += 0001-fix-preprocessing-bug.patch +#PATCHFILES += 0001-fix-preprocessing-bug.patch # 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 @@ -81,14 +81,14 @@ SPKG_DESC_CSWunbound = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound2 RUNTIME_DEP_PKGS_CSWunbound += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1 +#RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1 RUNTIME_DEP_PKGS_CSWunbound += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent2-0-5 CATALOGNAME_CSWlibunbound2 = libunbound2 SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) -RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 +#RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent2-0-5 @@ -101,8 +101,9 @@ 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 += CSWlibldns1 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibunbound2 +RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibssl1-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 wahwah at users.sourceforge.net Sun Apr 6 13:34:38 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 11:34:38 +0000 Subject: SF.net SVN: gar:[23358] csw/mgar/gar/v2/lib/python Message-ID: <3g1t8W3xYJzpr@mail.opencsw.org> Revision: 23358 http://sourceforge.net/p/gar/code/23358 Author: wahwah Date: 2014-04-06 11:34:37 +0000 (Sun, 06 Apr 2014) Log Message: ----------- stale-packages-report: A new utility Generates a HTML report about stale packages in the catalog. Looks at the unstable i386 SunOS5.10 catalog - the report does not reflect other catalogs. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_age.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/stale_packages_report.py Modified: csw/mgar/gar/v2/lib/python/package_age.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_age.py 2014-04-06 11:22:06 UTC (rev 23357) +++ csw/mgar/gar/v2/lib/python/package_age.py 2014-04-06 11:34:37 UTC (rev 23358) @@ -16,10 +16,10 @@ dev.off() """ +import argparse +import dateutil.parser import logging import requests -import argparse -import dateutil.parser from lib.python import opencsw Added: csw/mgar/gar/v2/lib/python/stale_packages_report.py =================================================================== --- csw/mgar/gar/v2/lib/python/stale_packages_report.py (rev 0) +++ csw/mgar/gar/v2/lib/python/stale_packages_report.py 2014-04-06 11:34:37 UTC (rev 23358) @@ -0,0 +1,263 @@ +#!/opt/csw/bin/python +# coding: utf-8 + +"""Retrieve catalog state and generate a HTML report of stale packages.""" + +import logging +import requests +import argparse +import dateutil.parser +import datetime +import jinja2 + +from collections import namedtuple + +from lib.python import opencsw + +INACTIVE_MAINTAINER_CUTOFF = 2 +STALE_PACKAGE_CUTOFF = 4 +REMOVE_SUGGESTION_CUTOFF = 4 +REPORT_TMPL = u""" + + Packages to rebuild + + + + +

Stale packages report

+

+ In this report maintainers are marked inactive if they haven't published + any packages for {{ inactive_maint_cutoff }} years. Packages are marked stale + after they've reached the age of {{ stale_pkg_cutoff }} years. +

+

+ This cleanup is done as part of OpenCSW Wintercamp in Z?rich. +

+
    + {% for username in maintainers|sort %} +
  • + {{ username }} + {% if maintainers[username].active %} + (active, + {% else %} + (inactive, + {% endif %} + last activity + {{ maintainers[username].last_activity.strftime('%Y-%m-%d') }} + + {{ maintainers[username].last_activity_pkg.catalogname }}) +
      + {% for catalogname in maintainers[username].pkgs|sort %} + {% if maintainers[username].pkgs[catalogname].old %} +
    • + + {{ catalogname }} + + ({{ maintainers[username].pkgs[catalogname].age }} + years{% if revdeps[maintainers[username].pkgs[catalogname].pkgname] %}, + {% if revdeps[maintainers[username].pkgs[catalogname].pkgname]|length > 5 %} + {{ revdeps[maintainers[username].pkgs[catalogname].pkgname]|length }} revdeps + {% else %} + revdeps: + {% for rd in revdeps[maintainers[username].pkgs[catalogname].pkgname] %} + {{ rd }} + {% endfor %} + {% endif %} + {% endif %}) + {% if maintainers[username].pkgs[catalogname].rebuild %} + REBUILD because newer packages depend on + this one + {% endif %} +
    • + {% endif %} + {% endfor %} +
    +
  • + {% endfor %} +
+

Packages that could be dropped now

+

+ Here's a list of packages that: (1) have inactive maintainers, (2) are older + than {{ remove_suggestion_cutoff }} years, (3) have no reverse dependencies. +

+
+{% for entry in packages_to_drop|sort(attribute='catalogname') %}
+# {{ entry.desc }} (by {{ entry.maintainer }})
+./lib/python/safe_remove_package.py --os-releases=SunOS5.9,SunOS5.10,SunOS5.11 -c {{ entry.catalogname }}
+{% endfor %}
+
+ +""" + +class BadDateError(Exception): + """There was a bad date tag.""" + + +Maintainer = namedtuple('Maintainer', + ['username', 'pkgs', 'last_activity', 'last_activity_pkg', 'active']) + + + +def MakeColorTuple(hc): + R, G, B = hc[1:3], hc[3:5], hc[5:7] + R, G, B = int(R, 16), int(G, 16), int(B, 16) + return R, G, B + + +def IntermediateColor(startcol, targetcol, frac): + """Return an intermediate color. + + Fraction can be any rational number, but only the 0-1 range produces + gradients. + """ + if frac < 0: + frac = 0 + if frac >= 1.0: + frac = 1.0 + sc = MakeColorTuple(startcol) + tc = MakeColorTuple(targetcol) + dR = tc[0] - sc[0] + dG = tc[1] - sc[1] + dB = tc[2] - sc[2] + R = sc[0] + dR * frac + G = sc[1] + dG * frac + B = sc[2] + dB * frac + return "#%02x%02x%02x" % (R, G, B) + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('output', help='Output file') + args = parser.parse_args() + url = ('http://buildfarm.opencsw.org/pkgdb/rest/catalogs/' + 'unstable/i386/SunOS5.10/timing/') + data = requests.get(url).json() + + bad_dates = [] + revdeps = {} + maintainers = {} + packages_to_drop = [] + for entry in data: + entry['maintainer'] = entry['maintainer'].split('@')[0] + parsed_fn = opencsw.ParsePackageFileName(entry['basename']) + dates_to_try = [] + if 'REV' in parsed_fn['revision_info']: + dates_to_try.append(parsed_fn['revision_info']['REV']) + else: + logging.warning('{catalogname} did not have a REV=. ' + 'Falling back to mtime.'.format(**entry)) + dates_to_try.append(entry['mtime']) + + for date_str in dates_to_try: + try: + date = dateutil.parser.parse(date_str) + break + except ValueError as exc: + logging.warning(exc) + logging.warning( + "WTF is {date} in {catalogname}? " + "Go home {maintainer}, you're drunk.".format( + catalogname=entry['catalogname'], + maintainer=entry['maintainer'], + date=date_str)) + bad_dates.append(date_str) + continue + entry['date'] = date + maintainer = maintainers.setdefault(entry['maintainer'], + Maintainer(username=entry['maintainer'], pkgs={}, + last_activity=datetime.datetime(1970, 1, 1, 0, 0), + last_activity_pkg=None, + active=True)) + if entry['catalogname'] not in maintainer.pkgs: + maintainer.pkgs[entry['catalogname']] = entry + if maintainer.last_activity < date: + maintainer = maintainer._replace(last_activity=date) + maintainer = maintainer._replace(last_activity_pkg=entry) + maintainers[maintainer.username] = maintainer + revdeps.setdefault(entry['pkgname'], set()) + for dep in entry['deps']: + revdeps.setdefault(dep, set()).add(entry['pkgname']) + del entry + if bad_dates: + logging.warning('Bad dates encountered. mtime used as fallback.') + now = datetime.datetime.now() + activity_cutoff = now - datetime.timedelta(days=INACTIVE_MAINTAINER_CUTOFF*365) + stale_pkg_cutoff = now - datetime.timedelta(days=STALE_PACKAGE_CUTOFF*365) + + # Make an index by pkgname + pkgs_by_pkgname = {} + for maintainer in maintainers.itervalues(): + for catalogname in maintainer.pkgs: + entry = maintainer.pkgs[catalogname] + pkgs_by_pkgname[entry['pkgname']] = entry + + for username in maintainers: + if maintainers[username].last_activity < activity_cutoff: + maintainers[username] = maintainers[username]._replace(active=False) + pkgs = maintainers[username].pkgs + for catalogname in pkgs: + pkgs[catalogname]['old'] = pkgs[catalogname]['date'] < stale_pkg_cutoff + # All packages by inactive maintainers are stale by definition + if not maintainers[username].active: + pkgs[catalogname]['old'] = True + age = now - pkgs[catalogname]['date'] + years = '%.1f' % (age.days / 365.0) + pkgs[catalogname]['age'] = years + after_cutoff = stale_pkg_cutoff - pkgs[catalogname]['date'] + frac = after_cutoff.days / float(365 * 4) + # frac = age.days / (365 * 4) + pkgs[catalogname]['color'] = IntermediateColor('#FFCC00', '#F995A0', frac) + + # Package dropping logic + entry = pkgs[catalogname] + maintainer = maintainers[username] + if (age > datetime.timedelta(days=REMOVE_SUGGESTION_CUTOFF*365) and + not revdeps[entry['pkgname']] and + not maintainer.active): + packages_to_drop.append(entry) + + # Find packages to rebuild + # + for username in maintainers: + pkgs = maintainers[username].pkgs + for catalogname in pkgs: + entry = pkgs[catalogname] + entry['rebuild'] = False + for revdep_pkgname in revdeps[entry['pkgname']]: + revdep = pkgs_by_pkgname[revdep_pkgname] + if not revdep['old'] and entry['old']: + entry['rebuild'] = True + with open(args.output, 'wb') as fd: + template = jinja2.Template(REPORT_TMPL) + fd.write(template.render(maintainers=maintainers, revdeps=revdeps, + inactive_maint_cutoff=INACTIVE_MAINTAINER_CUTOFF, + stale_pkg_cutoff=STALE_PACKAGE_CUTOFF, + packages_to_drop=packages_to_drop, + remove_suggestion_cutoff=REMOVE_SUGGESTION_CUTOFF).encode('utf-8')) + + +if __name__ == '__main__': + main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 6 14:05:22 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 6 Apr 2014 12:05:22 +0000 Subject: SF.net SVN: gar:[23359] csw/mgar/pkg/jhead/trunk Message-ID: <3g1tqw2pK6zyc@mail.opencsw.org> Revision: 23359 http://sourceforge.net/p/gar/code/23359 Author: cgrzemba Date: 2014-04-06 12:05:19 +0000 (Sun, 06 Apr 2014) Log Message: ----------- jhead/trunk: Update, installs in global, why? Modified Paths: -------------- csw/mgar/pkg/jhead/trunk/Makefile csw/mgar/pkg/jhead/trunk/checksums csw/mgar/pkg/jhead/trunk/files/makefile.patch Modified: csw/mgar/pkg/jhead/trunk/Makefile =================================================================== --- csw/mgar/pkg/jhead/trunk/Makefile 2014-04-06 11:34:37 UTC (rev 23358) +++ csw/mgar/pkg/jhead/trunk/Makefile 2014-04-06 12:05:19 UTC (rev 23359) @@ -1,7 +1,7 @@ NAME = jhead -VERSION = 2.7 -GARTYPE = v1 +VERSION = 2.97 + DESCRIPTION = EXIF parser for JPEG images define BLURB Jhead can extract and modify EXIF information contained in JPEG files. @@ -14,6 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GCC4 PATCHFILES = makefile.patch # jhead doesn't use configure Modified: csw/mgar/pkg/jhead/trunk/checksums =================================================================== --- csw/mgar/pkg/jhead/trunk/checksums 2014-04-06 11:34:37 UTC (rev 23358) +++ csw/mgar/pkg/jhead/trunk/checksums 2014-04-06 12:05:19 UTC (rev 23359) @@ -1,5 +1 @@ -e6ea1eacd35c55dfd8dc1f6dd0abaa2d download/jhead-2.5.tar.gz -be10a197a8858de5d86ae89219e806fb download/jhead-2.7.tar.gz -cf3dc9340ce7b293ad72c92628d92bc9 download/CSWjhead.gspec -0f3f88e96c51e3e65a30cb9099edabe5 download/CSWjhead.prototype -4a984e0245f66d0b51942e954ec79361 download/makefile.patch +23b037d0c54211973a3951e41a97c924 jhead-2.97.tar.gz Modified: csw/mgar/pkg/jhead/trunk/files/makefile.patch =================================================================== --- csw/mgar/pkg/jhead/trunk/files/makefile.patch 2014-04-06 11:34:37 UTC (rev 23358) +++ csw/mgar/pkg/jhead/trunk/files/makefile.patch 2014-04-06 12:05:19 UTC (rev 23359) @@ -1,32 +1,21 @@ ---- jhead-2.5.orig/makefile 2006-01-08 09:13:16.000000000 -0800 -+++ jhead-2.5/makefile 2007-01-21 18:29:55.424938000 -0800 -@@ -4,12 +4,27 @@ - OBJ=. - SRC=. +--- a/makefile ++++ b/makefile +@@ -14,10 +14,16 @@ $(OBJ)/%.o:$(SRC)/%.c + ${CC} $(CFLAGS) -c $< -o $@ -+myprefix?=/opt/csw -+ - all: jhead - - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} -O3 -Wall -c $< -o $@ -+ ${CC} $(CFLAGS) -c $< -o $@ - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm + ${CC} $(LDFLAGS) -o jhead $(objs) -lm -+ -+install: all + + clean: + rm -f $(objs) jhead + + install: +- cp jhead ${DESTDIR}/usr/local/bin/ + echo DESTDIR=$(DESTDIR) + sed '1,/^Liscence:/d' < readme.txt >COPYING + test -x /usr/ccs/bin/strip && /usr/ccs/bin/strip jhead + test -x /usr/ccs/bin/mcs && /usr/ccs/bin/mcs -d jhead -+ ginstall -D jhead $(DESTDIR)$(myprefix)/bin/jhead -+ ginstall -D jhead.1.gz $(DESTDIR)$(myprefix)/share/man/man1/jhead.1.gz -+ ginstall -D changes.txt $(DESTDIR)$(myprefix)/share/doc/jhead/changes.txt -+ gzip -d $(DESTDIR)$(myprefix)/share/man/man1/jhead.1.gz -+ -+clean: -+ rm -f *.o jhead ++ ginstall -D jhead $(DESTDIR)$(prefix)/bin/jhead ++ ginstall -D jhead.1 $(DESTDIR)$(mandir)/man1/jhead.1 ++ ginstall -D changes.txt $(DESTDIR)$(docdir)/jhead/changes.tx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 14:17:16 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 12:17:16 +0000 Subject: SF.net SVN: gar:[23360] csw/mgar/pkg/sbcl/trunk/Makefile Message-ID: <3g1v5d144Tz13m@mail.opencsw.org> Revision: 23360 http://sourceforge.net/p/gar/code/23360 Author: wahwah Date: 2014-04-06 12:17:14 +0000 (Sun, 06 Apr 2014) Log Message: ----------- sbcl/trunk: Build for 5.10 only Modified Paths: -------------- csw/mgar/pkg/sbcl/trunk/Makefile Modified: csw/mgar/pkg/sbcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sbcl/trunk/Makefile 2014-04-06 12:05:19 UTC (rev 23359) +++ csw/mgar/pkg/sbcl/trunk/Makefile 2014-04-06 12:17:14 UTC (rev 23360) @@ -4,7 +4,6 @@ NAME = sbcl VERSION = 1.0.23 -# VERSION = 1.1.7 GARTYPE = v2 DESCRIPTION = High performance Common Lisp compiler define BLURB @@ -17,7 +16,6 @@ VENDOR_URL = http://www.sbcl.org/ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION)-source.tar.bz2 -PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc CONFIGURE_SCRIPTS = BUILD_SCRIPTS = sbcl @@ -34,7 +32,7 @@ include gar/category.mk post-extract: - gfind "$(WORKSRC)" -name '*.sh' -exec gsed -e 's+#!/bin/sh+#!/opt/csw/bin/bash+' -i {} \; + gfind "$(WORKSRC)" -type f -exec gsed -e 's+#!/bin/sh+#!/opt/csw/bin/bash+' -i {} \; @$(MAKECOOKIE) build-sbcl: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 14:45:22 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 12:45:22 +0000 Subject: SF.net SVN: gar:[23361] csw/mgar/gar/v2/lib/python/stale_packages_report.py Message-ID: <3g1vk3216mz1G6@mail.opencsw.org> Revision: 23361 http://sourceforge.net/p/gar/code/23361 Author: wahwah Date: 2014-04-06 12:45:21 +0000 (Sun, 06 Apr 2014) Log Message: ----------- stale-packages-report: Lighter colors Modified Paths: -------------- csw/mgar/gar/v2/lib/python/stale_packages_report.py Modified: csw/mgar/gar/v2/lib/python/stale_packages_report.py =================================================================== --- csw/mgar/gar/v2/lib/python/stale_packages_report.py 2014-04-06 12:17:14 UTC (rev 23360) +++ csw/mgar/gar/v2/lib/python/stale_packages_report.py 2014-04-06 12:45:21 UTC (rev 23361) @@ -17,6 +17,8 @@ INACTIVE_MAINTAINER_CUTOFF = 2 STALE_PACKAGE_CUTOFF = 4 REMOVE_SUGGESTION_CUTOFF = 4 +STALE_FROM_COLOR = '#FFDDBB' +STALE_TO_COLOR = '#F995A0' REPORT_TMPL = u""" Packages to rebuild @@ -228,8 +230,8 @@ pkgs[catalogname]['age'] = years after_cutoff = stale_pkg_cutoff - pkgs[catalogname]['date'] frac = after_cutoff.days / float(365 * 4) - # frac = age.days / (365 * 4) - pkgs[catalogname]['color'] = IntermediateColor('#FFCC00', '#F995A0', frac) + pkgs[catalogname]['color'] = IntermediateColor( + STALE_FROM_COLOR, STALE_TO_COLOR, frac) # Package dropping logic entry = pkgs[catalogname] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 15:26:17 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 13:26:17 +0000 Subject: SF.net SVN: gar:[23362] csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Message-ID: <3g1wdH63Z2z1LX@mail.opencsw.org> Revision: 23362 http://sourceforge.net/p/gar/code/23362 Author: wahwah Date: 2014-04-06 13:26:17 +0000 (Sun, 06 Apr 2014) Log Message: ----------- gnome-base/libbonoboui/trunk: Split the library to a separate package Modified Paths: -------------- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2014-04-06 12:45:21 UTC (rev 23361) +++ csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2014-04-06 13:26:17 UTC (rev 23362) @@ -4,8 +4,6 @@ GARTYPE = v2 DESCRIPTION = UI code for the GNOME 2 Object Activation Framework -define BLURB -endef MASTER_SITES = $(GNOME_MIRROR) DISTNAME = $(GNOME_PROJ)-$(VERSION) @@ -14,27 +12,53 @@ # New glib only available on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgnome2-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgnomecanvas2-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWorbit2 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgconf2-4 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibglade2 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibart -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibbonobo2 -RUNTIME_DEP_PKGS_CSWlibbonoboui += CSWlibatk1-0-0 +PACKAGES += CSWlibbonoboui2-0 +PKGFILES_CSWlibbonoboui2-0 += $(call baseisadirs,$(libdir),libbonoboui-2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibbonoboui2-0 += $(DESCRIPTION), libbonoboui-2.so.0 +OBSOLETED_BY_CSWlibbonoboui2-0 = CSWlibbonoboui +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibart +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgnome2-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgnomecanvas2-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWorbit2 -CHECKPKG_OVERRIDES_CSWlibbonoboui += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libbonoboui-2.so -CHECKPKG_OVERRIDES_CSWlibbonoboui += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbonoboui-2.so.0.0.0|soname=libbonoboui-2.so.0|pkgname=CSWlibbonoboui|expected=CSWlibbonoboui2-0 +PACKAGES += CSWlibbonoboui-dev +SPKG_DESC_CSWlibbonoboui-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibbonoboui2-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgnome2-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWorbit2 + # There is a problem with the 64 bits build and the # the previous package didn't have the 64 bits libraries # so we disable this for now @@ -44,10 +68,8 @@ #CONFIGURE_ARGS += --enable-static=no #CONFIGURE_ARGS += --enable-gtk-doc -EXTRA_LD_OPTIONS = -z ignore -Bdirect - EXTRA_TEST_EXPORTS = DISPLAY -TEST_SCRIPTS = +TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 15:43:40 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 13:43:40 +0000 Subject: SF.net SVN: gar:[23363] csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Message-ID: <3g1x1X26ZVz1QK@mail.opencsw.org> Revision: 23363 http://sourceforge.net/p/gar/code/23363 Author: wahwah Date: 2014-04-06 13:43:37 +0000 (Sun, 06 Apr 2014) Log Message: ----------- gnome-base/libbonoboui/trunk: Put message files together with the library Modified Paths: -------------- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2014-04-06 13:26:17 UTC (rev 23362) +++ csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2014-04-06 13:43:37 UTC (rev 23363) @@ -13,10 +13,9 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWlibbonoboui2-0 -PKGFILES_CSWlibbonoboui2-0 += $(call baseisadirs,$(libdir),libbonoboui-2\.so\.0(\.\d+)*) SPKG_DESC_CSWlibbonoboui2-0 += $(DESCRIPTION), libbonoboui-2.so.0 +OBSOLETED_BY_CSWlibbonoboui2-0 = CSWlibbonoboui -OBSOLETED_BY_CSWlibbonoboui2-0 = CSWlibbonoboui RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibart RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibbonobo2 @@ -25,6 +24,7 @@ RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibglade2 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgnome2-0 @@ -39,6 +39,7 @@ PACKAGES += CSWlibbonoboui-dev SPKG_DESC_CSWlibbonoboui-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibbonoboui-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui-dev += CSWlibbonobo2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 6 15:54:46 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 6 Apr 2014 13:54:46 +0000 Subject: SF.net SVN: gar:[23364] csw/mgar/pkg/jhead/trunk Message-ID: <3g1xHn1yqZz1Tn@mail.opencsw.org> Revision: 23364 http://sourceforge.net/p/gar/code/23364 Author: cgrzemba Date: 2014-04-06 13:54:44 +0000 (Sun, 06 Apr 2014) Log Message: ----------- jhead/trunk: update version and recipe Modified Paths: -------------- csw/mgar/pkg/jhead/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/jhead/trunk/files/CSWjhead.gspec csw/mgar/pkg/jhead/trunk/files/CSWjhead.prototype Modified: csw/mgar/pkg/jhead/trunk/Makefile =================================================================== --- csw/mgar/pkg/jhead/trunk/Makefile 2014-04-06 13:43:37 UTC (rev 23363) +++ csw/mgar/pkg/jhead/trunk/Makefile 2014-04-06 13:54:44 UTC (rev 23364) @@ -1,5 +1,6 @@ NAME = jhead VERSION = 2.97 +GARTYPE = v2 DESCRIPTION = EXIF parser for JPEG images @@ -9,21 +10,19 @@ MASTER_SITES = http://www.sentex.net/~mwandel/jhead/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWjhead.gspec CSWjhead.prototype +PATCHFILES += makefile.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - GARCOMPILER = GCC4 -PATCHFILES = makefile.patch +PACKAGES += CSWjhead + # jhead doesn't use configure CONFIGURE_SCRIPTS = # jhead doesn't have a test target -TEST_TARGET = +TEST_SCRIPTS = -SPKG_SOURCEURL = http://www.sentex.net/~mwandel/jhead/ -SPKG_PKGBASE = $(DESTDIR)$(prefix) +VENDOR_URL = http://www.sentex.net/~mwandel/jhead/ +#SPKG_PKGBASE = $(DESTDIR)$(prefix) include gar/category.mk Deleted: csw/mgar/pkg/jhead/trunk/files/CSWjhead.gspec =================================================================== --- csw/mgar/pkg/jhead/trunk/files/CSWjhead.gspec 2014-04-06 13:43:37 UTC (rev 23363) +++ csw/mgar/pkg/jhead/trunk/files/CSWjhead.gspec 2014-04-06 13:54:44 UTC (rev 23364) @@ -1,6 +0,0 @@ -%var bitname jhead -%var pkgname CSWjhead -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING -%pkginfo -BASEDIR=/opt/csw Deleted: csw/mgar/pkg/jhead/trunk/files/CSWjhead.prototype =================================================================== --- csw/mgar/pkg/jhead/trunk/files/CSWjhead.prototype 2014-04-06 13:43:37 UTC (rev 23363) +++ csw/mgar/pkg/jhead/trunk/files/CSWjhead.prototype 2014-04-06 13:54:44 UTC (rev 23364) @@ -1,9 +0,0 @@ -d none bin 0755 root bin -f none bin/jhead 0755 root bin -d none share 0755 root bin -d none share/man 0755 root bin -d none share/man/man1 0755 root bin -f none share/man/man1/jhead.1 0755 root bin -d none share/doc 0755 root bin -d none share/doc/jhead 0755 root bin -f none share/doc/jhead/changes.txt 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 Sun Apr 6 16:28:21 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 6 Apr 2014 14:28:21 +0000 Subject: SF.net SVN: gar:[23365] csw/mgar/pkg/pv/trunk Message-ID: <3g1y0s6M9Kz13@mail.opencsw.org> Revision: 23365 http://sourceforge.net/p/gar/code/23365 Author: dmichelsen Date: 2014-04-06 14:28:16 +0000 (Sun, 06 Apr 2014) Log Message: ----------- pv/trunk: Update to 1.5.2 and latest standards Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pv/trunk/checksums Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2014-04-06 13:54:44 UTC (rev 23364) +++ csw/mgar/pkg/pv/trunk/Makefile 2014-04-06 14:28:16 UTC (rev 23365) @@ -1,5 +1,5 @@ NAME = pv -VERSION = 1.2.0 +VERSION = 1.5.2 GARTYPE = v2 DESCRIPTION = Monitor the progress of data through a pipe @@ -13,21 +13,20 @@ endef VENDOR_URL = http://www.ivarch.com/programs/pv.shtml -MASTER_SITES = http://pipeviewer.googlecode.com/files/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -LICENSE = doc/COPYING +MASTER_SITES = http://www.ivarch.com/programs/sources/ +DISTFILES += $(DISTNAME).tar.bz2 +LICENSE = doc/COPYING -UPSTREAM_MASTER_SITES = $(VENDOR_URL) +PACKAGES += CSWpv +SPKG_DESC_CSWpv = Monitor the progress of data through a pipe +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpv += CSWlibintl8 -RUNTIME_DEP_PKGS = CSWlibintl8 +# We require GNU grep +TEST_ENV_PATH = /opt/csw/gnu:$(PATH) -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk -# test-012 uses tr complements (-c) which don't work with /usr/bin/tr -PATH := /opt/csw/gnu:$(PATH) - post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) post-install-modulated: gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2014-04-06 13:54:44 UTC (rev 23364) +++ csw/mgar/pkg/pv/trunk/checksums 2014-04-06 14:28:16 UTC (rev 23365) @@ -1 +1 @@ -f7cc65c850ac98c6013cc448050eee4b pv-1.2.0.tar.gz +fdcd0be1e333602f82a70921b87976b8 pv-1.5.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 17:23:59 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 15:23:59 +0000 Subject: SF.net SVN: gar:[23366] csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Message-ID: <3g1zF44ZGwz7W@mail.opencsw.org> Revision: 23366 http://sourceforge.net/p/gar/code/23366 Author: wahwah Date: 2014-04-06 15:23:59 +0000 (Sun, 06 Apr 2014) Log Message: ----------- gnome-base/libbonoboui/trunk: Some deps only for sparc Modified Paths: -------------- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2014-04-06 14:28:16 UTC (rev 23365) +++ csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2014-04-06 15:23:59 UTC (rev 23366) @@ -16,21 +16,25 @@ SPKG_DESC_CSWlibbonoboui2-0 += $(DESCRIPTION), libbonoboui-2.so.0 OBSOLETED_BY_CSWlibbonoboui2-0 = CSWlibbonoboui +# These are only required on sparc. It could be a build problem. +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0_sparc += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0_sparc += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0_sparc += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += $(RUNTIME_DEP_PKGS_CSWlibbonoboui2-0_$(GARCH)) + +# Common between intel and sparc. RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibart RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibbonobo2 -RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgconf2-4 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibglade2 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgnome2-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgnomecanvas2-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibbonoboui2-0 += CSWlibpopt0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 18:06:45 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 16:06:45 +0000 Subject: SF.net SVN: gar:[23367] csw/mgar/pkg/httping/trunk Message-ID: <3g20BQ3QdkzDJ@mail.opencsw.org> Revision: 23367 http://sourceforge.net/p/gar/code/23367 Author: wahwah Date: 2014-04-06 16:06:37 +0000 (Sun, 06 Apr 2014) Log Message: ----------- httping/trunk: Rebuild. Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2014-04-06 15:23:59 UTC (rev 23366) +++ csw/mgar/pkg/httping/trunk/Makefile 2014-04-06 16:06:37 UTC (rev 23367) @@ -6,19 +6,16 @@ VERSION = 1.5.3 GARTYPE = v2 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - DESCRIPTION = Httping is like 'ping' but for http-requests. define BLURB Httping is like 'ping' but for http-requests. Give it an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers). Be aware that the transmission across the - network also takes time! + network also takes time! endef MASTER_SITES = http://www.vanheusden.com/httping/ DISTFILES = $(NAME)-$(VERSION).tgz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz BUILD_DEP_PKGS += CSWlibssl-dev RUNTIME_DEP_PKGS += CSWlibssl1-0-0 Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2014-04-06 15:23:59 UTC (rev 23366) +++ csw/mgar/pkg/httping/trunk/checksums 2014-04-06 16:06:37 UTC (rev 23367) @@ -1 +1 @@ -bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz +62879f0a2d70e32279081276d42aaa28 httping-1.5.3.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 18:50:45 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 16:50:45 +0000 Subject: SF.net SVN: gar:[23368] csw/mgar/gar/v2/lib/python/recursive_remove_order. py Message-ID: <3g219C1jLmzKJ@mail.opencsw.org> Revision: 23368 http://sourceforge.net/p/gar/code/23368 Author: wahwah Date: 2014-04-06 16:50:45 +0000 (Sun, 06 Apr 2014) Log Message: ----------- recursive-remove-order: A new tool It displays in which order to remove a given package. Added Paths: ----------- csw/mgar/gar/v2/lib/python/recursive_remove_order.py Added: csw/mgar/gar/v2/lib/python/recursive_remove_order.py =================================================================== --- csw/mgar/gar/v2/lib/python/recursive_remove_order.py (rev 0) +++ csw/mgar/gar/v2/lib/python/recursive_remove_order.py 2014-04-06 16:50:45 UTC (rev 23368) @@ -0,0 +1,51 @@ +#!/opt/csw/bin/python +# coding: utf-8 + +"""Display in which order to remove packages with safe_remove_pkg. + +We do not build this into safe_remove_pkg on purpose: we want the list of +packages to be reviewed by a human before removal. +""" + +import logging +import requests +import argparse +import dateutil.parser +import datetime +import jinja2 + +from collections import namedtuple + +from lib.python import opencsw + + +def RemoveDFS(fd, pkgs_by_pkgname, revdeps, removed, pkgname): + pkg = pkgs_by_pkgname[pkgname] + for revdep_pkgname in revdeps[pkgname]: + RemoveDFS(fd, pkgs_by_pkgname, revdeps, removed, revdep_pkgname) + c = pkg['catalogname'] + if c not in removed: + fd.write('./lib/python/safe_remove_package.py --os-releases=SunOS5.9,SunOS5.10,SunOS5.11 -c %s\n' % c) + removed.add(c) + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('pkgname', help='Package to remove (pkgname)') + parser.add_argument('output', help='output file') + args = parser.parse_args() + url = ('http://buildfarm.opencsw.org/pkgdb/rest/catalogs/' + 'unstable/i386/SunOS5.10/timing/') + data = requests.get(url).json() + revdeps = {} + pkgs_by_pkgname = {} + removed = set() + for entry in data: + pkgs_by_pkgname[entry['pkgname']] = entry + revdeps.setdefault(entry['pkgname'], set()) + for dep in entry['deps']: + revdeps.setdefault(dep, set()).add(entry['pkgname']) + with open(args.output, 'wb') as fd: + RemoveDFS(fd, pkgs_by_pkgname, revdeps, removed, args.pkgname) + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/recursive_remove_order.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 6 23:57:24 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 21:57:24 +0000 Subject: SF.net SVN: gar:[23369] csw/mgar/pkg/lang-python/python/branches/python-3.4 / Message-ID: <3g27z843f5zlg@mail.opencsw.org> Revision: 23369 http://sourceforge.net/p/gar/code/23369 Author: wahwah Date: 2014-04-06 21:57:21 +0000 (Sun, 06 Apr 2014) Log Message: ----------- python: Create a branch for Python 3.4 Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-3.4/ Index: csw/mgar/pkg/lang-python/python/branches/python-3.4 =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3 2014-04-06 16:50:45 UTC (rev 23368) +++ csw/mgar/pkg/lang-python/python/branches/python-3.4 2014-04-06 21:57:21 UTC (rev 23369) Property changes on: csw/mgar/pkg/lang-python/python/branches/python-3.4 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +gar +work Added: svn:mergeinfo ## -0,0 +1 ## +/csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 7 00:02:15 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 6 Apr 2014 22:02:15 +0000 Subject: SF.net SVN: gar:[23370] csw/mgar/pkg/libgnomeprintui/trunk/Makefile Message-ID: <3g284c3VRnzq6@mail.opencsw.org> Revision: 23370 http://sourceforge.net/p/gar/code/23370 Author: wahwah Date: 2014-04-06 22:02:15 +0000 (Sun, 06 Apr 2014) Log Message: ----------- libgnomeprintui/trunk: conditional deps. I have a sense this is wrong. Modified Paths: -------------- csw/mgar/pkg/libgnomeprintui/trunk/Makefile Modified: csw/mgar/pkg/libgnomeprintui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomeprintui/trunk/Makefile 2014-04-06 21:57:21 UTC (rev 23369) +++ csw/mgar/pkg/libgnomeprintui/trunk/Makefile 2014-04-06 22:02:15 UTC (rev 23370) @@ -20,37 +20,35 @@ PACKAGES += CSWlibgnomeprintui2-2-0 PKGFILES_CSWlibgnomeprintui2-2-0 += $(call baseisadirs,$(libdir),libgnomeprintui-2-2\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgnomeprintui2-2-0 += $(DESCRIPTION), libgnomeprintui-2-2.so.0 + +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += $(RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0_$(GARCH)) + RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibart RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgnomecanvas2-0 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgnomeprint RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibpango1-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibpangocairo1-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibpangoft2-1-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibz1 - PACKAGES += CSWlibgnomeprintui-dev SPKG_DESC_CSWlibgnomeprintui-dev += $(DESCRIPTION), development files PKGFILES_CSWlibgnomeprintui-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibgnomeprintui-dev += CSWlibgnomeprintui2-2-0 -PACKAGES += CSWlibgnomeprintui2-2-0-common -SPKG_DESC_CSWlibgnomeprintui2-2-0-common = $(DESCRIPTION), common files -ARCHALL_CSWlibgnomeprintui2-2-0-common = 1 - OBSOLETED_BY_CSWlibgnomeprintui2-2-0 = CSWlibgnomeprintui EXTRA_CONFIGURE_ENV = PATH=/opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Apr 7 02:15:49 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 7 Apr 2014 00:15:49 +0000 Subject: SF.net SVN: gar:[23371] csw/mgar/pkg/vidalia/trunk Message-ID: <3g2C4P3NK7z10Y@mail.opencsw.org> Revision: 23371 http://sourceforge.net/p/gar/code/23371 Author: jake_goerzen Date: 2014-04-07 00:15:48 +0000 (Mon, 07 Apr 2014) Log Message: ----------- vidalia: update to 0.2.20; configure build to use gcc; update runtime deps Modified Paths: -------------- csw/mgar/pkg/vidalia/trunk/Makefile csw/mgar/pkg/vidalia/trunk/checksums Modified: csw/mgar/pkg/vidalia/trunk/Makefile =================================================================== --- csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-06 22:02:15 UTC (rev 23370) +++ csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 00:15:48 UTC (rev 23371) @@ -1,5 +1,5 @@ NAME = vidalia -VERSION = 0.2.19 +VERSION = 0.2.20 GARTYPE = v2 DESCRIPTION = Controller GUI for Tor @@ -15,11 +15,11 @@ # no patches so lets skip this to save a little time NOGITPATCH = 1 -RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtxml4-gxx -RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtnetwork4-gxx -RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtcore4-gxx +RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtxml4 +RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtnetwork4 +RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWvidalia += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtgui4-gxx +RUNTIME_DEP_PKGS_CSWvidalia += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWvidalia += CSWlibgcc-s1 GARCOMPILER = GNU @@ -36,10 +36,12 @@ configure-custom: mkdir $(WORKSRC)/build - cd $(WORKSRC)/build && /opt/csw/bin/cmake \ + cd $(WORKSRC)/build && CC=gcc /opt/csw/bin/cmake \ -DCMAKE_INSTALL_PREFIX:PATH=/opt/csw \ -DCMAKE_INSTALL_RPATH:PATH=/opt/csw/lib:/opt/csw/gxx/lib \ -DCMAKE_EXE_LINKER_FLAGS:STRING='-lsocket -lnsl' \ + -DCMAKE_INCLUDE_PATH:PATH=/opt/csw/include \ + -DCMAKE_CXX_COMPILER=/opt/csw/bin/g++ \ -DQT_QMAKE_EXECUTABLE=/opt/csw/gxx/bin/qmake .. @$(MAKECOOKIE) Modified: csw/mgar/pkg/vidalia/trunk/checksums =================================================================== --- csw/mgar/pkg/vidalia/trunk/checksums 2014-04-06 22:02:15 UTC (rev 23370) +++ csw/mgar/pkg/vidalia/trunk/checksums 2014-04-07 00:15:48 UTC (rev 23371) @@ -1 +1 @@ -caf92b44ad2932bbc1c40d6405951c39 vidalia-0.2.19.tar.gz +f40a3a1c43f4a1f16322969c0cb6f5bf vidalia-0.2.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Apr 7 03:46:56 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 7 Apr 2014 01:46:56 +0000 Subject: SF.net SVN: gar:[23372] csw/mgar/pkg/vidalia/trunk/Makefile Message-ID: <3g2F3r6p65z15R@mail.opencsw.org> Revision: 23372 http://sourceforge.net/p/gar/code/23372 Author: jake_goerzen Date: 2014-04-07 01:46:55 +0000 (Mon, 07 Apr 2014) Log Message: ----------- vidalia: add LD_OPTIONS=-Bdirect for direct binding Modified Paths: -------------- csw/mgar/pkg/vidalia/trunk/Makefile Modified: csw/mgar/pkg/vidalia/trunk/Makefile =================================================================== --- csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 00:15:48 UTC (rev 23371) +++ csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 01:46:55 UTC (rev 23372) @@ -46,7 +46,7 @@ @$(MAKECOOKIE) build-custom: - cd $(WORKSRC)/build && /opt/csw/bin/gmake + cd $(WORKSRC)/build && LD_OPTIONS=-Bdirect /opt/csw/bin/gmake @$(MAKECOOKIE) install-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Apr 7 10:32:38 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 7 Apr 2014 08:32:38 +0000 Subject: SF.net SVN: gar:[23373] csw/mgar/pkg/mod_nss/trunk/Makefile Message-ID: <3g2Q403VBtz1LK@mail.opencsw.org> Revision: 23373 http://sourceforge.net/p/gar/code/23373 Author: cgrzemba Date: 2014-04-07 08:32:36 +0000 (Mon, 07 Apr 2014) Log Message: ----------- mod_nss/trunk: add build_dep_pkgs section Modified Paths: -------------- csw/mgar/pkg/mod_nss/trunk/Makefile Modified: csw/mgar/pkg/mod_nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_nss/trunk/Makefile 2014-04-07 01:46:55 UTC (rev 23372) +++ csw/mgar/pkg/mod_nss/trunk/Makefile 2014-04-07 08:32:36 UTC (rev 23373) @@ -22,8 +22,13 @@ # BUILD64_LIBS_ONLY = 1 PACKAGING_PLATFORMS += solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 -GARCOMPILER = SOS12U2 +GARCOMPILER = SOS12U3 + +BUILD_DEP_PKGS += CSWapache2-dev +BUILD_DEP_PKGS += CSWnspr-dev +BUILD_DEP_PKGS += CSWlibnss-dev + TEST_SCRIPTS = EXTRA_LINKER_FLAGS = -xnorunpath -norunpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Apr 7 12:11:59 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 7 Apr 2014 10:11:59 +0000 Subject: SF.net SVN: gar:[23374] csw/mgar/pkg/nss/trunk/Makefile Message-ID: <3g2SGg4QPtz1VL@mail.opencsw.org> Revision: 23374 http://sourceforge.net/p/gar/code/23374 Author: cgrzemba Date: 2014-04-07 10:11:58 +0000 (Mon, 07 Apr 2014) Log Message: ----------- nss/trunk: add a compiler switch Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2014-04-07 08:32:36 UTC (rev 23373) +++ csw/mgar/pkg/nss/trunk/Makefile 2014-04-07 10:11:58 UTC (rev 23374) @@ -48,7 +48,8 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # GARCOMPILER = GCC4 -# GARCOMPILER = SOS12U3 +GARFLAVOR = DBG +GARCOMPILER = SOS12U3 PACKAGES += CSWlibnss3 CATALOGNAME_CSWlibnss3 = libnss3 @@ -59,7 +60,7 @@ RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnss3_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename # CHECKPKG_OVERRIDES_CSWlibnss3 += shared-lib-pkgname-mismatch @@ -71,7 +72,7 @@ RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnssckbi_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename # CHECKPKG_OVERRIDES_CSWlibnssckb1 += shared-lib-pkgname-mismatch @@ -85,7 +86,7 @@ RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnssdbm3_GCC4 += CSWlibgcc-s1 # i368 needs that, sparcs hates that CHECKPKG_OVERRIDES_CSWlibnssdbm3 += surplus-dependency|CSWlibplc4 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename @@ -99,7 +100,7 @@ RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnssutil3_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename # CHECKPKG_OVERRIDES_CSWlibnssutil3 += shared-lib-pkgname-mismatch @@ -113,7 +114,7 @@ RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmime3_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename # CHECKPKG_OVERRIDES_CSWlibsmine3 += shared-lib-pkgname-mismatch @@ -128,7 +129,7 @@ RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnssutil3 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplds4 -RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsoftokn3_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename # CHECKPKG_OVERRIDES_CSWlibsoftokn3 += shared-lib-pkgname-mismatch @@ -141,7 +142,7 @@ RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnssutil3 -RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibssl3_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename # CHECKPKG_OVERRIDES_CSWlibssl3 += shared-lib-pkgname-mismatch @@ -154,7 +155,7 @@ PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*) RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibfreebl3_GCC4 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename CHECKPKG_OVERRIDES_CSWlibfreebl3_sparc += shared-lib-pkgname-mismatch CHECKPKG_OVERRIDES_CSWlibfreebl3 += $(CHECKPKG_OVERRIDES_CSWlibfreebl3_$(GARCH)) @@ -199,10 +200,6 @@ BUILD64 = 1 -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = nss -INSTALL_SCRIPTS = nss -TEST_SCRIPTS = MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) @@ -287,6 +284,16 @@ # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html # NOISAEXEC = 1 +GARCOMP_FLAGS_GCC4 = NS_USE_GCC=1 +GARCOMP_FLAGS_SOS12U3 = + +# for whoami +EXTRA_BUILD_ENV = PATH=$(PATH):/usr/ucb + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = nss +INSTALL_SCRIPTS = nss +TEST_SCRIPTS = include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile @@ -294,16 +301,16 @@ build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ - && \ + && $(BUILD_ENV) \ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ - gmake -j1 NS_USE_GCC=1 NO_MDUPDATE=1) + gmake -j1 $(GARCOMP_FLAGS_$(GARCOMPILER)) NO_MDUPDATE=1) @$(MAKECOOKIE) build-dbm: (cd $(WORKSRC)/mozilla/security/dbm \ && \ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ - gmake -j1 NS_USE_GCC=1 NO_MDUPDATE=1) + gmake -j1 $(GARCOMP_FLAGS_$(GARCOMPILER)) NO_MDUPDATE=1) @$(MAKECOOKIE) # There's an extra interpolation somehwere inside nss' build system, so $$$$ @@ -312,7 +319,7 @@ @echo $(LD_OPTIONS) (cd $(WORKSRC)/mozilla/security/nss \ && env \ - && gmake -j1 BUILD_SUN_PKG=1 NS_USE_GCC=1 NO_MDUPDATE=1) + && gmake -j1 BUILD_SUN_PKG=1 $(GARCOMP_FLAGS_$(GARCOMPILER)) NO_MDUPDATE=1) @$(MAKECOOKIE) install-nss: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Apr 7 14:32:00 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 7 Apr 2014 12:32:00 +0000 Subject: SF.net SVN: gar:[23375] csw/mgar/pkg/nss/trunk Message-ID: <3g2WN93VJ9zCm@mail.opencsw.org> Revision: 23375 http://sourceforge.net/p/gar/code/23375 Author: cgrzemba Date: 2014-04-07 12:31:59 +0000 (Mon, 07 Apr 2014) Log Message: ----------- nss/trunk: add some debugging auxiliaries Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/0007-skip-assertion.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2014-04-07 10:11:58 UTC (rev 23374) +++ csw/mgar/pkg/nss/trunk/Makefile 2014-04-07 12:31:59 UTC (rev 23375) @@ -280,6 +280,8 @@ PATCHFILES += 0006-config.mk-linking.patch PATCHFILES += 0005-SunOS5.mk.patch PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch +PATCHFILES_DBG += 0007-skip-assertion.patch +PATCHFILES += $(PATCHFILES_$(GARFLAVOR)) # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html # NOISAEXEC = 1 Added: csw/mgar/pkg/nss/trunk/files/0007-skip-assertion.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/0007-skip-assertion.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/0007-skip-assertion.patch 2014-04-07 12:31:59 UTC (rev 23375) @@ -0,0 +1,12 @@ +--- a/mozilla/security/nss/lib/ssl/sslnonce.c ++++ b/mozilla/security/nss/lib/ssl/sslnonce.c +@@ -121,7 +121,8 @@ static PRStatus initSessionCacheLocksLazily(void) + return PR_FAILURE; + } + rv = NSS_RegisterShutdown(ssl_ShutdownLocks, NULL); +- PORT_Assert(SECSuccess == rv); ++ /* asserts cores if debug mode */ ++ /* PORT_Assert(SECSuccess == rv); */ + if (SECSuccess != rv) { + return PR_FAILURE; + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Apr 7 17:47:11 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 7 Apr 2014 15:47:11 +0000 Subject: SF.net SVN: gar:[23376] csw/mgar/pkg/vidalia/trunk Message-ID: <3g2bjM11JhzZq@mail.opencsw.org> Revision: 23376 http://sourceforge.net/p/gar/code/23376 Author: jake_goerzen Date: 2014-04-07 15:47:09 +0000 (Mon, 07 Apr 2014) Log Message: ----------- vidalia: bump to version 0.2.21 Modified Paths: -------------- csw/mgar/pkg/vidalia/trunk/Makefile csw/mgar/pkg/vidalia/trunk/checksums Modified: csw/mgar/pkg/vidalia/trunk/Makefile =================================================================== --- csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 12:31:59 UTC (rev 23375) +++ csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 15:47:09 UTC (rev 23376) @@ -1,5 +1,5 @@ NAME = vidalia -VERSION = 0.2.20 +VERSION = 0.2.21 GARTYPE = v2 DESCRIPTION = Controller GUI for Tor Modified: csw/mgar/pkg/vidalia/trunk/checksums =================================================================== --- csw/mgar/pkg/vidalia/trunk/checksums 2014-04-07 12:31:59 UTC (rev 23375) +++ csw/mgar/pkg/vidalia/trunk/checksums 2014-04-07 15:47:09 UTC (rev 23376) @@ -1 +1 @@ -f40a3a1c43f4a1f16322969c0cb6f5bf vidalia-0.2.20.tar.gz +8d3079a66d79c79ccfefb929b820f9ac vidalia-0.2.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Apr 7 19:46:55 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 7 Apr 2014 17:46:55 +0000 Subject: SF.net SVN: gar:[23377] csw/mgar/pkg/vidalia/trunk/Makefile Message-ID: <3g2fMW5FJbzlt@mail.opencsw.org> Revision: 23377 http://sourceforge.net/p/gar/code/23377 Author: jake_goerzen Date: 2014-04-07 17:46:54 +0000 (Mon, 07 Apr 2014) Log Message: ----------- vidalia: remove paths in build recipe referencing /opt/csw/gxx/.. Modified Paths: -------------- csw/mgar/pkg/vidalia/trunk/Makefile Modified: csw/mgar/pkg/vidalia/trunk/Makefile =================================================================== --- csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 15:47:09 UTC (rev 23376) +++ csw/mgar/pkg/vidalia/trunk/Makefile 2014-04-07 17:46:54 UTC (rev 23377) @@ -38,11 +38,11 @@ mkdir $(WORKSRC)/build cd $(WORKSRC)/build && CC=gcc /opt/csw/bin/cmake \ -DCMAKE_INSTALL_PREFIX:PATH=/opt/csw \ - -DCMAKE_INSTALL_RPATH:PATH=/opt/csw/lib:/opt/csw/gxx/lib \ + -DCMAKE_INSTALL_RPATH:PATH=/opt/csw/lib \ -DCMAKE_EXE_LINKER_FLAGS:STRING='-lsocket -lnsl' \ -DCMAKE_INCLUDE_PATH:PATH=/opt/csw/include \ -DCMAKE_CXX_COMPILER=/opt/csw/bin/g++ \ - -DQT_QMAKE_EXECUTABLE=/opt/csw/gxx/bin/qmake .. + -DQT_QMAKE_EXECUTABLE=/opt/csw/bin/qmake .. @$(MAKECOOKIE) build-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Apr 7 21:09:22 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 7 Apr 2014 19:09:22 +0000 Subject: SF.net SVN: gar:[23378] csw/mgar/pkg/openssl1/trunk Message-ID: <3g2hBh2JxVztv@mail.opencsw.org> Revision: 23378 http://sourceforge.net/p/gar/code/23378 Author: chninkel Date: 2014-04-07 19:09:20 +0000 (Mon, 07 Apr 2014) Log Message: ----------- openssl1/trunk: updated to 1.0.1g Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-04-07 17:46:54 UTC (rev 23377) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-04-07 19:09:20 UTC (rev 23378) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.1f +VERSION = 1.0.1g GARTYPE = v2 SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2014-04-07 17:46:54 UTC (rev 23377) +++ csw/mgar/pkg/openssl1/trunk/checksums 2014-04-07 19:09:20 UTC (rev 23378) @@ -1 +1 @@ -f26b09c028a0541cab33da697d522b25 openssl-1.0.1f.tar.gz +de62b43dfcd858e66a74bee1c834e959 openssl-1.0.1g.tar.gz Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-04-07 17:46:54 UTC (rev 23377) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-04-07 19:09:20 UTC (rev 23378) @@ -1,3 +1,9 @@ +openssl (1.0.1g,rev=2014.04.07) unstable + + * New upstream release. + + -- yann rouillard Mon, 07 Apr 2014 21:07:48 +0200 + openssl (1.0.1f,rev=2014.02.07) unstable * Manpages and html doc are back in the package ! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Apr 7 21:52:16 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 7 Apr 2014 19:52:16 +0000 Subject: SF.net SVN: gar:[23379] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: <3g2j894nztz112@mail.opencsw.org> Revision: 23379 http://sourceforge.net/p/gar/code/23379 Author: chninkel Date: 2014-04-07 19:52:16 +0000 (Mon, 07 Apr 2014) Log Message: ----------- openssl1/trunk: override a checkpkg false alarm Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-04-07 19:09:20 UTC (rev 23378) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-04-07 19:52:16 UTC (rev 23379) @@ -67,7 +67,11 @@ CHECKPKG_OVERRIDES_CSWlibssl1-0-0_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 +# This is a false alarm, this is a configuration file added at install time +# through the preserveconf class +CHECKPKG_OVERRIDES_CSWopenssl-utils += file-needed-but-no-package-satisfies-it|/etc/opt/csw/ssl/openssl.cnf|CSWopenssl-utils|contains|symlink|/opt/csw/ssl/openssl.cnf|which|needs|the|target|file:|/etc/opt/csw/ssl/openssl.cnf + # We use SUN perl, not the opencsw one CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Apr 8 15:43:02 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 8 Apr 2014 13:43:02 +0000 Subject: SF.net SVN: gar:[23380] csw/mgar/pkg/389-ds-base/branches/vers1.3.2 Message-ID: <3g38w12NllzZT@mail.opencsw.org> Revision: 23380 http://sourceforge.net/p/gar/code/23380 Author: cgrzemba Date: 2014-04-08 13:43:02 +0000 (Tue, 08 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: add patches, interim fix for #47770 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile Added Paths: ----------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-handle-delete-memberuid-posix-winsync.c.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0027-Slapi-rwlock-size.patch csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0030-reconstruct-memberuid-generation-task.patch Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-07 19:52:16 UTC (rev 23379) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-08 13:43:02 UTC (rev 23380) @@ -31,6 +31,7 @@ PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch PATCHFILES += 0005-smf-autoenable-no.patch PATCHFILES += 0005-add-var-run-create-initconfig.in.patch +truct-memberuid-generation-task.patch PATCHFILES += 0005-add-var-run-create-template-initconfig.in.patch # until Red Hat Bugzilla Bug 773617 is open do it yourself # PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch @@ -43,7 +44,11 @@ # PATCHFILES += 0011-Makefile.am.patch # PATCHFILES += 0009-fix-for-550-memberuid-not-created.patch # PATCHFILES += 0012-fix-for-47327.patch -PATCHFILES += 0013-use-posix-threads-configure.ac.patch + +# PATCHFILES += 0013-use-posix-threads-configure.ac.patch +# PATCHFILES += 0023-phtread-include-slapi2nspr.c.patch +PATCHFILES += 0027-Slapi-rwlock-size.patch + PATCHFILES += 0014-ldap-include-Makefile.am.patch # needed at least on GCC4 PATCHFILES += 0015-use-PL_strcasestr-acllas.c.patch @@ -54,9 +59,9 @@ PATCHFILES += 0018-correct-64bit-ptr-bind.c PATCHFILES += 0021-include-lber.h-slapi-plugin.h.patch PATCHFILES += 0022-adjust-mozldap-version-sasl_io.c.patch -PATCHFILES += 0023-phtread-include-slapi2nspr.c.patch PATCHFILES += 0024-strndup.patch PATCHFILES += 0025-posix-winsync.rawentry.patch +PATCHFILES += 0030-reconstruct-memberuid-generation-task.patch PATCHFILES += $(PATCHFILES_$(GARCOMPILER)) BUILD_DEP_PKGS += CSWautoconf Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-handle-delete-memberuid-posix-winsync.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-handle-delete-memberuid-posix-winsync.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-handle-delete-memberuid-posix-winsync.c.patch 2014-04-08 13:43:02 UTC (rev 23380) @@ -0,0 +1,53 @@ +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -954,17 +955,19 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + + slapi_attr_get_type(attr, &type); + for (; attr_map[i].windows_attribute_name != NULL; i++) { ++ Slapi_Attr *local_attr = NULL; ++ char *local_type = NULL; ++ local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); ++ slapi_entry_attr_find(ds_entry, local_type, &local_attr); ++ is_present_local = (NULL == local_attr) ? 0 : 1; + if (0 == slapi_attr_type_cmp(type, attr_map[i].windows_attribute_name, +- SLAPI_TYPE_CMP_SUBTYPE)) { +- Slapi_Attr *local_attr = NULL; +- char *local_type = NULL; ++ SLAPI_TYPE_CMP_SUBTYPE)) ++ { ++ + + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "_pre_ds_mod_group_cb -- found AD attr %s\n", type); + slapi_attr_get_valueset(attr, &vs); +- local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); +- slapi_entry_attr_find(ds_entry, local_type, &local_attr); +- is_present_local = (NULL == local_attr) ? 0 : 1; + if (is_present_local) { + int values_equal = 0; + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +@@ -989,10 +992,21 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + } + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- values compared\n"); + +- slapi_ch_free((void**) &local_type); + slapi_valueset_free(vs); +- /* what about if delete all values on windows ???? */ +- } ++ } else { ++ /* what about if delete all values on windows ? -> delete*/ ++ if (is_present_local) { ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- update mods: %s, %s : values deleted -> modify\n", ++ slapi_sdn_get_dn(slapi_entry_get_sdn_const(ds_entry)), ++ local_type); ++ ++ ++ slapi_mods_add_mod_values(smods, LDAP_MOD_DELETE, local_type, NULL); ++ *do_modify = 1; ++ } ++ } ++ slapi_ch_free((void**) &local_type); + } + } + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0027-Slapi-rwlock-size.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0027-Slapi-rwlock-size.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0027-Slapi-rwlock-size.patch 2014-04-08 13:43:02 UTC (rev 23380) @@ -0,0 +1,32 @@ +--- a/ldap/servers/slapd/entry.c ++++ b/ldap/servers/slapd/entry.c +@@ -2064,7 +2064,7 @@ slapi_entry_size(Slapi_Entry *e) + if (e->e_uniqueid) size += strlen(e->e_uniqueid) + 1; + if (e->e_dncsnset) size += csnset_size(e->e_dncsnset); + if (e->e_maxcsn) size += sizeof( CSN ); +- if (e->e_virtual_lock) size += sizeof(Slapi_RWLock); ++ if (e->e_virtual_lock) size += sizeof(Slapi_RWLock_size); + /* Slapi_DN and RDN are included in Slapi_Entry */ + size += (slapi_sdn_get_size(&e->e_sdn) - sizeof(Slapi_DN)); + size += (slapi_rdn_get_size(&e->e_srdn) - sizeof(Slapi_RDN)); +--- a/ldap/servers/slapd/pw.c ++++ b/ldap/servers/slapd/pw.c +@@ -2728,7 +2728,7 @@ pw_get_ext_size(Slapi_Entry *entry, size_t *size) + return LDAP_SUCCESS; + } + *size += sizeof(struct slapi_pw_entry_ext); +- *size += sizeof(Slapi_RWLock); ++ *size += sizeof(Slapi_RWLock_size); + if (LDAP_SUCCESS == slapi_pw_get_entry_ext(entry, &pw_entry_values)) { + Slapi_Value *cvalue; + int idx = valuearray_first_value(pw_entry_values, &cvalue); +--- a/ldap/servers/slapd/slapi-plugin.h ++++ b/ldap/servers/slapd/slapi-plugin.h +@@ -6000,6 +6000,7 @@ typedef struct slapi_condvar Slapi_CondVar; + typedef pthread_rwlock_t Slapi_RWLock; + #else + typedef struct slapi_rwlock Slapi_RWLock; ++#define Slapi_RWLock_size (5*sizeof(void*)+(4*sizeof(PRUint32))) + #endif + Slapi_Mutex *slapi_new_mutex( void ); + void slapi_destroy_mutex( Slapi_Mutex *mutex ); Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0030-reconstruct-memberuid-generation-task.patch =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0030-reconstruct-memberuid-generation-task.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0030-reconstruct-memberuid-generation-task.patch 2014-04-08 13:43:02 UTC (rev 23380) @@ -0,0 +1,375 @@ +From 4e356cca64387b814a5ae08f1bf246132372370b Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 8 Apr 2014 15:30:21 +0200 +Subject: [PATCH] reconstruct memberuid generation task + +--- + .../plugins/posix-winsync/posix-group-task.c | 144 +++++++++++++++++---- + .../plugins/posix-winsync/posix-winsync-config.c | 2 +- + .../plugins/posix-winsync/posix-wsp-ident.h | 2 +- + 3 files changed, 119 insertions(+), 29 deletions(-) + +diff --git a/ldap/servers/plugins/posix-winsync/posix-group-task.c b/ldap/servers/plugins/posix-winsync/posix-group-task.c +index 9f558bf..d038f08 100644 +--- a/ldap/servers/plugins/posix-winsync/posix-group-task.c ++++ b/ldap/servers/plugins/posix-winsync/posix-group-task.c +@@ -31,7 +31,7 @@ valueset_get_valuearray(const Slapi_ValueSet *vs); /* stolen from proto-slap.h * + + /* interface function */ + int +-posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, ++posix_group_memberuid_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, + char *returntext, void *arg); + + Slapi_Entry * +@@ -62,7 +62,7 @@ fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val) + + /* e configEntry */ + int +-posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, ++posix_group_memberuid_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, + char *returntext, void *arg) + { + PRThread *thread = NULL; +@@ -76,7 +76,7 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: ==>\n"); ++ "posix_group_memberuid_task_add: ==>\n"); + + /* get arg(s) */ + /* default: set replication basedn */ +@@ -87,16 +87,16 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: retrieved basedn: %s\n", dn); ++ "posix_group_memberuid_task_add: retrieved basedn: %s\n", dn); + +- if ((filter = fetch_attr(e, "filter", "(objectclass=ntGroup)")) == NULL) { ++ if ((filter = fetch_attr(e, "filter", "(&(objectclass=posixGroup)(uniquemember=*))")) == NULL) { + *returncode = LDAP_OBJECT_CLASS_VIOLATION; + rv = SLAPI_DSE_CALLBACK_ERROR; + goto out; + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: retrieved filter: %s\n", filter); ++ "posix_group_memberuid_task_add: retrieved filter: %s\n", filter); + + /* setup our task data */ + mytaskdata = (task_data*) slapi_ch_malloc(sizeof(task_data)); +@@ -109,31 +109,31 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + mytaskdata->filter_str = slapi_ch_strdup(filter); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task data allocated\n"); ++ "posix_group_memberuid_task_add: task data allocated\n"); + + /* allocate new task now */ + char * ndn = slapi_entry_get_ndn(e); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: creating task object: %s\n", ++ "posix_group_memberuid_task_add: creating task object: %s\n", + ndn); + + task = slapi_new_task(ndn); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task object created\n"); ++ "posix_group_memberuid_task_add: task object created\n"); + + /* register our destructor for cleaning up our private data */ + slapi_task_set_destructor_fn(task, posix_group_task_destructor); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task destructor set\n"); ++ "posix_group_memberuid_task_add: task destructor set\n"); + + /* Stash a pointer to our data in the task */ + slapi_task_set_data(task, mytaskdata); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task object initialized\n"); ++ "posix_group_memberuid_task_add: task object initialized\n"); + + /* start the sample task as a separate thread */ + thread = PR_CreateThread(PR_USER_THREAD, posix_group_fixup_task_thread, (void *) task, +@@ -141,7 +141,7 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + SLAPD_DEFAULT_THREAD_STACKSIZE); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: thread created\n"); ++ "posix_group_memberuid_task_add: thread created\n"); + + if (thread == NULL) { + slapi_log_error(SLAPI_LOG_FATAL, POSIX_WINSYNC_PLUGIN_NAME, +@@ -155,7 +155,7 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + + out: + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: <==\n"); ++ "posix_group_memberuid_task_add: <==\n"); + + return rv; + } +@@ -174,7 +174,6 @@ posix_group_task_destructor(Slapi_Task *task) + } + } + +-#if 0 /* NOT USED */ + static int + posix_group_del_memberuid_callback(Slapi_Entry *e, void *callback_data) + { +@@ -209,7 +208,6 @@ posix_group_del_memberuid_callback(Slapi_Entry *e, void *callback_data) + + return rc; + } +-#endif + + static int + posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) +@@ -220,6 +218,9 @@ posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) + + /* char *attrs[]={"uniquemember","memberuid",NULL}; */ + ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, ++ "_fix_memberuid, filter: %s==>\n", filter_str ); ++ + slapi_search_internal_set_pb(search_pb, dn, LDAP_SCOPE_SUBTREE, filter_str, 0, 0, 0, 0, + posix_winsync_get_plugin_identity(), 0); + +@@ -229,6 +230,8 @@ posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) + + slapi_pblock_destroy(search_pb); + ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, ++ "_fix_memberuid for entry: <== rc=%d\n", rc ); + return rc; + } + +@@ -238,10 +241,12 @@ posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) + * 1. forall uniquemember search if posixAccount ? add uid : "" + */ + static int +-posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) ++posix_group_fix_memberuid_cb(Slapi_Entry *e, void *callback_data) + { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid ==>\n"); ++ "_fix_memberuid_cb for entry: %s==>\n", ++ slapi_entry_get_dn_const(e)); ++ + cb_data *the_cb_data = (cb_data *) callback_data; + + int rc; +@@ -270,7 +275,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid scan for orphaned memberuids\n"); ++ "_fix_memberuid_cb scan for orphaned memberuids\n"); + + int i; + for (i = slapi_attr_first_value(muid_attr, &v); i != -1; +@@ -278,7 +283,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + char *muid = (char *)slapi_value_get_string(v); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid iterating memberuid: %s\n", ++ "_fix_memberuid_cb iterating memberuid: %s\n", + muid); + + size_t vallen = muid ? strlen(muid) : 0; +@@ -296,7 +301,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + posix_winsync_get_plugin_identity(), 0); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid searching %s with filter: %s\n", ++ "_fix_memberuid_cb searching %s with filter: %s\n", + the_cb_data->dn, filter); + + rc = slapi_search_internal_pb(search_pb); +@@ -305,14 +310,14 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + + if (!search_entries || !search_entries[0]) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid Adding bad memberuid %s\n", ++ "_fix_memberuid_cb deleting bad memberuid %s\n", + slapi_value_get_string(v)); + + slapi_mods_add_string(smods, LDAP_MOD_DELETE, "memberuid", slapi_value_get_string(v)); + + if (dsmuid_vs && slapi_valueset_find(dsmuid_attr, dsmuid_vs, v)) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid Adding bad dsonlymemberuid %s\n", ++ "_fix_memberuid_cb delete bad dsonlymemberuid %s\n", + slapi_value_get_string(v)); + + slapi_mods_add_string(smods, LDAP_MOD_DELETE, "dsonlymemberuid", slapi_value_get_string(v)); +@@ -342,7 +347,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + Slapi_Value * uniqval = NULL; /* uniquemeber Attribute values */ + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid scan uniquemember, group %s\n", dn); ++ "_fix_memberuid_cb scan uniquemember, group %s\n", dn); + for (i = slapi_attr_first_value(obj_attr, &uniqval); i != -1; + i = slapi_attr_next_value(obj_attr, i, &uniqval)) { + +@@ -352,7 +357,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + + if (!child) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid orphaned uniquemember found: %s\n", member); ++ "_fix_memberuid_cb orphaned uniquemember found: %s\n", member); + + if (strncasecmp(member, "cn=", 3) == 0) { + fixMembership = 1; +@@ -365,13 +370,13 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid Finishing...\n"); ++ "_fix_memberuid_cb Finishing...\n"); + + if (fixMembership && posix_winsync_config_get_mapNestedGrouping()) { + Slapi_ValueSet *del_nested_vs = slapi_valueset_new(); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid group deleted, recalculating nesting\n"); ++ "_fix_memberuid_cb group deleted, recalculating nesting\n"); + propogateDeletionsUpward(e, sdn, bad_ums, del_nested_vs, 0); + + slapi_valueset_free(del_nested_vs); del_nested_vs = NULL; +@@ -386,6 +391,8 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + mods = slapi_mods_get_ldapmods_passout(smods); + if (mods) { + Slapi_PBlock *mod_pb = NULL; ++ if (slapi_is_loglevel_set(SLAPI_LOG_PLUGIN)) ++ slapi_mods_dump(smods, "fix_memberuid_cb - mods dump - change memberuids"); + mod_pb = slapi_pblock_new(); + slapi_modify_internal_set_pb_ext(mod_pb, sdn, mods, 0, 0, + posix_winsync_get_plugin_identity(), 0); +@@ -399,7 +406,90 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + slapi_mods_free(&smods); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid <==\n"); ++ "_fix_memberuid_cb <==\n"); ++ return rc; ++} ++ ++static int ++posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) ++{ ++ int rc = 0; ++ char *dn = slapi_entry_get_dn(e); ++ Slapi_DN *sdn = slapi_entry_get_sdn(e); ++ ++ Slapi_Attr *obj_attr = NULL; ++ ++ rc = slapi_entry_attr_find(e, "uniquemember", &obj_attr); ++ if (rc == 0) { /* Found uniquemember, so... */ ++ int i; ++ Slapi_Value * value = slapi_value_new(); /* new memberuid Attribute values */ ++ Slapi_Value * uniqval = NULL; /* uniquemeber Attribute values */ ++ Slapi_ValueSet *uids = slapi_valueset_new(); ++ ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, ++ "_fix_memberuid scan uniquemember, group %s\n", dn); ++ for (i = slapi_attr_first_value(obj_attr, &uniqval); i != -1; ++ i = slapi_attr_next_value(obj_attr, i, &uniqval)) { ++ const char *member = NULL; ++ char * uid = NULL; ++ member = slapi_value_get_string(uniqval); ++ /* search uid for member (DN) */ ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, "search %s\n", member); ++ if ((uid = searchUid(member)) != NULL) { ++ slapi_value_set_string(value, uid); ++ /* add uids ValueSet */ ++ slapi_valueset_add_value(uids, value); ++ } ++ } ++ slapi_value_free(&value); ++ ++ /* If we found some posix members, replace the existing memberuid attribute ++ * with the found values. */ ++ if (uids && slapi_valueset_count(uids)) { ++ Slapi_PBlock *mod_pb = slapi_pblock_new(); ++ Slapi_Value *val = 0; ++ Slapi_Mod *smod; ++ LDAPMod **mods = (LDAPMod **) slapi_ch_malloc(2 * sizeof(LDAPMod *)); ++ int hint = 0; ++ cb_data *the_cb_data = (cb_data *) callback_data; ++ ++ smod = slapi_mod_new(); ++ slapi_mod_init(smod, 0); ++ slapi_mod_set_operation(smod, LDAP_MOD_REPLACE | LDAP_MOD_BVALUES); ++ slapi_mod_set_type(smod, "memberuid"); ++ ++ /* Loop through all of our values and add them to smod */ ++ hint = slapi_valueset_first_value(uids, &val); ++ while (val) { ++ /* this makes a copy of the berval */ ++ slapi_mod_add_value(smod, slapi_value_get_berval(val)); ++ hint = slapi_valueset_next_value(uids, hint, &val); ++ } ++ ++ mods[0] = slapi_mod_get_ldapmod_passout(smod); ++ mods[1] = 0; ++ ++ if (slapi_is_loglevel_set(SLAPI_LOG_PLUGIN)) ++ slapi_mods_dump(mods, "_fix_memberuid_callback - mods dump - change memberuids"); ++ ++ slapi_modify_internal_set_pb_ext(mod_pb, sdn, mods, 0, 0, ++ posix_winsync_get_plugin_identity(), 0); ++ ++ slapi_pblock_set(mod_pb, SLAPI_TXN, the_cb_data->txn); ++ slapi_modify_internal_pb(mod_pb); ++ ++ slapi_pblock_get(mod_pb, SLAPI_PLUGIN_INTOP_RESULT, &rc); ++ ++ ldap_mods_free(mods, 1); ++ slapi_mod_free(&smod); ++ slapi_pblock_destroy(mod_pb); ++ } else { ++ /* No member were found, so remove the memberuid attribute ++ * from this entry. */ ++ posix_group_del_memberuid_callback(e, callback_data); ++ } ++ slapi_valueset_free(uids); ++ } + return rc; + } + +diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync-config.c b/ldap/servers/plugins/posix-winsync/posix-winsync-config.c +index a7fd6e9..4098ee2 100644 +--- a/ldap/servers/plugins/posix-winsync/posix-winsync-config.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync-config.c +@@ -205,7 +205,7 @@ posix_winsync_config(Slapi_Entry *config_e) + LDAP_SCOPE_BASE, POSIX_WINSYNC_CONFIG_FILTER, + posix_winsync_apply_config, NULL); + +- rc = slapi_task_register_handler("memberuid task", posix_group_task_add); ++ rc = slapi_task_register_handler("memberuid task", posix_group_memberuid_task_add); + if (rc) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, + "posix_winsync_config -- register memberuid task failed\n"); +diff --git a/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h b/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h +index f36fe40..88f6a9f 100644 +--- a/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h ++++ b/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h +@@ -45,7 +45,7 @@ void posix_winsync_config_set_MOFTaskCreated(); + PRBool posix_winsync_config_get_MOFTaskCreated(); + PRBool posix_winsync_config_get_mapNestedGrouping(); + +-int posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, ++int posix_group_memberuid_task_add(Slapi_PBlock *pb, Slapi_Entry *e, + Slapi_Entry *eAfter, int *returncode, char *returntext, + void *arg); + +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Apr 8 15:45:25 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 8 Apr 2014 13:45:25 +0000 Subject: SF.net SVN: gar:[23381] csw/mgar/pkg/389-ds-base/branches/vers1.3.2/ Makefile Message-ID: <3g38yP232Pzdy@mail.opencsw.org> Revision: 23381 http://sourceforge.net/p/gar/code/23381 Author: cgrzemba Date: 2014-04-08 13:45:24 +0000 (Tue, 08 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: some cleanups Modified Paths: -------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-08 13:43:02 UTC (rev 23380) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-08 13:45:24 UTC (rev 23381) @@ -31,10 +31,7 @@ PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch PATCHFILES += 0005-smf-autoenable-no.patch PATCHFILES += 0005-add-var-run-create-initconfig.in.patch -truct-memberuid-generation-task.patch PATCHFILES += 0005-add-var-run-create-template-initconfig.in.patch -# until Red Hat Bugzilla Bug 773617 is open do it yourself -# PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch PATCHFILES += 0006-remove-bashism-in-shell-templates.patch PATCHFILES += 0007-fixup-Makefile.am.patch # PATCHFILES += 0007-fixup-plugin_syntax.c.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 8 17:58:39 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 8 Apr 2014 15:58:39 +0000 Subject: SF.net SVN: gar:[23382] csw/mgar/pkg/openssl1/trunk Message-ID: <3g3CwN0Jbbzy0@mail.opencsw.org> Revision: 23382 http://sourceforge.net/p/gar/code/23382 Author: wahwah Date: 2014-04-08 15:58:37 +0000 (Tue, 08 Apr 2014) Log Message: ----------- openssl1/trunk: I'm almost sure this won't work. Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0076.patch csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0160.patch Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-04-08 13:45:24 UTC (rev 23381) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-04-08 15:58:37 UTC (rev 23382) @@ -10,10 +10,12 @@ # software causes damage. ##################################################################### +# Note: This build recipe does not work with parallel gmake (-j N) invocation. + ###### Package information ####### NAME = openssl -VERSION = 1.0.1g +VERSION = 1.0.1f GARTYPE = v2 SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') @@ -39,19 +41,19 @@ SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT) PKGFILES_CSWlibssl1-0-0 += $(libdir)(/[^/]*)?/openssl-1.0.0/engines/.* -PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs -PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* +PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs +PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl1-0-0 SPKG_DESC_CSWlibssl-dev = Openssl 1.0 development support files -PKGFILES_CSWlibssl-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibssl-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibssl-dev += $(docdir)/libssl_dev/.* RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-0-0 SPKG_DESC_CSWopenssl-utils = Openssl 1.0 binaries and related tools -PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(bindir)/.*/openssl -PKGFILES_CSWopenssl-utils += $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* -PKGFILES_CSWopenssl-utils += $(prefix)/ssl/misc/.* +PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(bindir)/.*/openssl +PKGFILES_CSWopenssl-utils += $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* +PKGFILES_CSWopenssl-utils += $(prefix)/ssl/misc/.* PKGFILES_CSWopenssl-utils += $(prefix)/ssl/openssl\.cnf.* PKGFILES_CSWopenssl-utils += $(sysconfdir)/ssl/openssl\.cnf.* PKGFILES_CSWopenssl-utils += $(docdir)/openssl_utils/.* @@ -79,7 +81,7 @@ MASTER_SITES = http://www.openssl.org/source/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += changelog.CSW README.CSW DISTFILES += map.openssl.libcrypto map.openssl.libssl map.openssl.engines @@ -89,12 +91,12 @@ ENGINES = 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi # configure targets patchs needs to be different for Solaris 9 as some map files -# are not available +# are not available ifeq ($(shell /usr/bin/uname -r),5.9) PATCH_SUFFIX = .SunOS5.9 endif -# This patch is taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ +# This patch is taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # original file: components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch # I think they are smarter than me to figure what are the best compiler options PATCHFILES = optimized_configure_targets.patch$(PATCH_SUFFIX) @@ -104,6 +106,11 @@ # (wonder if they are really worth it) PATCHFILES += more_configure_targets.patch$(PATCH_SUFFIX) + +PATCHFILES += CVE-2014-0076.patch +PATCHFILES += CVE-2014-0160.patch + + #PATCHFILES += fix-test-failure.patch # We install engines libraries in /opt/csw/lib/engines/1.0.0/ @@ -123,7 +130,7 @@ PATCHFILES += block_bad_certificates.patch # Add old-style certificates hash generation to maintain compatibilies -# with gnutls and programs linked with openssl 0.9.8 +# with gnutls and programs linked with openssl 0.9.8 # Patch taken from Debian PATCHFILES += c_rehash-compat.patch @@ -131,7 +138,7 @@ # crazy during library migration PATCHFILES += 0007-enables-symbols-versioning.patch -# openssl currently only uses issetugid on freebsd and openbsd +# openssl currently only uses issetugid on freebsd and openbsd # althought it is also available on Solaris 10 # We make issetugid support configurable via preprocessor flag # to be able to enable it for Solaris @@ -144,7 +151,7 @@ ENGINES += pk11 endif -# support for sparc t4 crypto engine +# support for sparc t4 crypto engine # see http://bubbva.blogspot.fr/2011/11/exciting-crypto-advances-with-t4.html # https://blogs.oracle.com/DanX/entry/sparc_t4_openssl_engine # patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ @@ -167,7 +174,7 @@ BUILD64 = 1 ISAEXEC = 1 -# The list of instructions set for which we will +# The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 @@ -175,7 +182,7 @@ # the openssl build system doesn't honor bindir # as it doesn't install 64 bits binaries in bin/{amd64,sparcv9} -# we fix this at the merge step +# we fix this at the merge step EXTRA_MERGE_DIRS_isa-amd64 = $(bindir_install) EXTRA_MERGE_DIRS_isa-sparcv9 = $(bindir_install) @@ -215,10 +222,10 @@ # but openssl doesn't use it by default so we manually enable it CONFIGURE_FLAGS = -DHAVE_ISSETUGID -# PKCS11 Patch also works on sparc64 athena processors thanks for the FJAES +# PKCS11 Patch also works on sparc64 athena processors thanks for the FJAES # instruction set. The presence of this instruction set is checked at runtime # by looking for the AV_SPARC_JFAES instruction set bit, unfortunately the -# corresponding macro in not present in Solaris 9-11 headers, so we manually +# corresponding macro in not present in Solaris 9-11 headers, so we manually # define it. CONFIGURE_FLAGS += -DAV_SPARC_FJAES=0 @@ -235,8 +242,8 @@ # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages ifneq ($(shell /usr/bin/uname -r),5.9) - CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) -endif + CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) +endif # For now we want the sun perl to be used EXTRA_CONFIGURE_ENV += PERL="/usr/bin/perl" @@ -245,7 +252,7 @@ # with the shell command added by the t4 patch EXTRA_CONFIGURE_ENV += MAKE="/opt/csw/bin/gmake" -# The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ +# The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # added "-z defs" to the linker options. That causes object compilation to fail because # they are not linked against libc and libdl (for Sol9). This is workaround until I find a better fix. EXTRA_LD_OPTIONS = -lc -ldl @@ -257,7 +264,7 @@ # library files are not automatically stripped STRIP_DIRS = $(DESTDIR)/$(libdir) $(DESTDIR)/$(libdir)/openssl-$(SONAME)/engines/ -TEST_SCRIPTS = +TEST_SCRIPTS = include gar/category.mk @@ -277,20 +284,20 @@ pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure - ln -nf $(WORKDIR)/map.openssl.libcrypto $(WORKSRC)/map.openssl.libcrypto - ln -nf $(WORKDIR)/map.openssl.libssl $(WORKSRC)/map.openssl.libssl + ln -nf $(WORKDIR)/map.openssl.libcrypto $(WORKSRC)/map.openssl.libcrypto + ln -nf $(WORKDIR)/map.openssl.libssl $(WORKSRC)/map.openssl.libssl for ENGINE in $(ENGINES); do \ ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/map.openssl.lib$$ENGINE; \ - done + done ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/ccgost/map.openssl.libgost @$(MAKECOOKIE) -install-conf-misc: +install-conf-misc: if [ -f "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ] && [ ! -h "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ]; then \ ginstall -d "$(PKGROOT)$(sysconfdir)/ssl"; \ mv "$(PKGROOT)$(prefix)/ssl/openssl.cnf" $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW; \ ln -sf ../../..$(sysconfdir)/ssl/openssl.cnf $(PKGROOT)$(prefix)/ssl/openssl.cnf; \ - fi + fi [ ! -d "$(PKGROOT)$(sysconfdir)/ssl/misc" ] || \ mv "$(PKGROOT)$(sysconfdir)/ssl/misc" "$(PKGROOT)/$(prefix)/ssl/" @@ -302,5 +309,6 @@ done @$(MAKECOOKIE) -post-merge-all: merge-doc install-conf-misc +post-merge-all: merge-doc install-conf-misc +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=heartbleed Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2014-04-08 13:45:24 UTC (rev 23381) +++ csw/mgar/pkg/openssl1/trunk/checksums 2014-04-08 15:58:37 UTC (rev 23382) @@ -1 +1 @@ -de62b43dfcd858e66a74bee1c834e959 openssl-1.0.1g.tar.gz +f26b09c028a0541cab33da697d522b25 openssl-1.0.1f.tar.gz Added: csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0076.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0076.patch (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0076.patch 2014-04-08 15:58:37 UTC (rev 23382) @@ -0,0 +1,167 @@ +Description: fix side-channel attack on Montgomery ladder implementation +Origin: upstream, http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=4b7a4ba29cafa432fc4266fe6e59e60bc1c96332 +Origin: upstream, http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=40acdb192e035f463d3c39c23fd8a68cf54df378 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742923 + +Index: openssl-1.0.1f/crypto/bn/bn.h +=================================================================== +--- openssl-1.0.1f.orig/crypto/bn/bn.h 2014-01-06 08:47:42.000000000 -0500 ++++ openssl-1.0.1f/crypto/bn/bn.h 2014-04-07 15:37:00.924343048 -0400 +@@ -538,6 +538,8 @@ + BIGNUM *BN_mod_sqrt(BIGNUM *ret, + const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx); + ++void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords); ++ + /* Deprecated versions */ + #ifndef OPENSSL_NO_DEPRECATED + BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe, +@@ -774,11 +776,20 @@ + + #define bn_fix_top(a) bn_check_top(a) + ++#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2) ++#define bn_wcheck_size(bn, words) \ ++ do { \ ++ const BIGNUM *_bnum2 = (bn); \ ++ assert(words <= (_bnum2)->dmax && words >= (_bnum2)->top); \ ++ } while(0) ++ + #else /* !BN_DEBUG */ + + #define bn_pollute(a) + #define bn_check_top(a) + #define bn_fix_top(a) bn_correct_top(a) ++#define bn_check_size(bn, bits) ++#define bn_wcheck_size(bn, words) + + #endif + +Index: openssl-1.0.1f/crypto/bn/bn_lib.c +=================================================================== +--- openssl-1.0.1f.orig/crypto/bn/bn_lib.c 2014-01-06 08:47:42.000000000 -0500 ++++ openssl-1.0.1f/crypto/bn/bn_lib.c 2014-04-07 15:37:00.924343048 -0400 +@@ -824,3 +824,55 @@ + } + return bn_cmp_words(a,b,cl); + } ++ ++/* ++ * Constant-time conditional swap of a and b. ++ * a and b are swapped if condition is not 0. The code assumes that at most one bit of condition is set. ++ * nwords is the number of words to swap. The code assumes that at least nwords are allocated in both a and b, ++ * and that no more than nwords are used by either a or b. ++ * a and b cannot be the same number ++ */ ++void BN_consttime_swap(BN_ULONG condition, BIGNUM *a, BIGNUM *b, int nwords) ++ { ++ BN_ULONG t; ++ int i; ++ ++ bn_wcheck_size(a, nwords); ++ bn_wcheck_size(b, nwords); ++ ++ assert(a != b); ++ assert((condition & (condition - 1)) == 0); ++ assert(sizeof(BN_ULONG) >= sizeof(int)); ++ ++ condition = ((condition - 1) >> (BN_BITS2 - 1)) - 1; ++ ++ t = (a->top^b->top) & condition; ++ a->top ^= t; ++ b->top ^= t; ++ ++#define BN_CONSTTIME_SWAP(ind) \ ++ do { \ ++ t = (a->d[ind] ^ b->d[ind]) & condition; \ ++ a->d[ind] ^= t; \ ++ b->d[ind] ^= t; \ ++ } while (0) ++ ++ ++ switch (nwords) { ++ default: ++ for (i = 10; i < nwords; i++) ++ BN_CONSTTIME_SWAP(i); ++ /* Fallthrough */ ++ case 10: BN_CONSTTIME_SWAP(9); /* Fallthrough */ ++ case 9: BN_CONSTTIME_SWAP(8); /* Fallthrough */ ++ case 8: BN_CONSTTIME_SWAP(7); /* Fallthrough */ ++ case 7: BN_CONSTTIME_SWAP(6); /* Fallthrough */ ++ case 6: BN_CONSTTIME_SWAP(5); /* Fallthrough */ ++ case 5: BN_CONSTTIME_SWAP(4); /* Fallthrough */ ++ case 4: BN_CONSTTIME_SWAP(3); /* Fallthrough */ ++ case 3: BN_CONSTTIME_SWAP(2); /* Fallthrough */ ++ case 2: BN_CONSTTIME_SWAP(1); /* Fallthrough */ ++ case 1: BN_CONSTTIME_SWAP(0); ++ } ++#undef BN_CONSTTIME_SWAP ++} +Index: openssl-1.0.1f/crypto/ec/ec2_mult.c +=================================================================== +--- openssl-1.0.1f.orig/crypto/ec/ec2_mult.c 2014-01-06 08:47:42.000000000 -0500 ++++ openssl-1.0.1f/crypto/ec/ec2_mult.c 2014-04-07 15:37:00.924343048 -0400 +@@ -208,11 +208,15 @@ + return ret; + } + ++ + /* Computes scalar*point and stores the result in r. + * point can not equal r. +- * Uses algorithm 2P of ++ * Uses a modified algorithm 2P of + * Lopez, J. and Dahab, R. "Fast multiplication on elliptic curves over + * GF(2^m) without precomputation" (CHES '99, LNCS 1717). ++ * ++ * To protect against side-channel attack the function uses constant time swap, ++ * avoiding conditional branches. + */ + static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, + const EC_POINT *point, BN_CTX *ctx) +@@ -246,6 +250,11 @@ + x2 = &r->X; + z2 = &r->Y; + ++ bn_wexpand(x1, group->field.top); ++ bn_wexpand(z1, group->field.top); ++ bn_wexpand(x2, group->field.top); ++ bn_wexpand(z2, group->field.top); ++ + if (!BN_GF2m_mod_arr(x1, &point->X, group->poly)) goto err; /* x1 = x */ + if (!BN_one(z1)) goto err; /* z1 = 1 */ + if (!group->meth->field_sqr(group, z2, x1, ctx)) goto err; /* z2 = x1^2 = x^2 */ +@@ -270,16 +279,12 @@ + word = scalar->d[i]; + while (mask) + { +- if (word & mask) +- { +- if (!gf2m_Madd(group, &point->X, x1, z1, x2, z2, ctx)) goto err; +- if (!gf2m_Mdouble(group, x2, z2, ctx)) goto err; +- } +- else +- { +- if (!gf2m_Madd(group, &point->X, x2, z2, x1, z1, ctx)) goto err; +- if (!gf2m_Mdouble(group, x1, z1, ctx)) goto err; +- } ++ BN_consttime_swap(word & mask, x1, x2, group->field.top); ++ BN_consttime_swap(word & mask, z1, z2, group->field.top); ++ if (!gf2m_Madd(group, &point->X, x2, z2, x1, z1, ctx)) goto err; ++ if (!gf2m_Mdouble(group, x1, z1, ctx)) goto err; ++ BN_consttime_swap(word & mask, x1, x2, group->field.top); ++ BN_consttime_swap(word & mask, z1, z2, group->field.top); + mask >>= 1; + } + mask = BN_TBIT; +Index: openssl-1.0.1f/util/libeay.num +=================================================================== +--- openssl-1.0.1f.orig/util/libeay.num 2014-01-06 09:35:55.000000000 -0500 ++++ openssl-1.0.1f/util/libeay.num 2014-04-07 15:37:03.976343033 -0400 +@@ -3511,6 +3511,7 @@ + d2i_ASIdOrRange 3904 EXIST::FUNCTION:RFC3779 + i2d_ASIdentifiers 3905 EXIST::FUNCTION:RFC3779 + CRYPTO_memcmp 3906 EXIST::FUNCTION: ++BN_consttime_swap 3907 EXIST::FUNCTION: + SEED_decrypt 3908 EXIST::FUNCTION:SEED + SEED_encrypt 3909 EXIST::FUNCTION:SEED + SEED_cbc_encrypt 3910 EXIST::FUNCTION:SEED Added: csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0160.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0160.patch (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/CVE-2014-0160.patch 2014-04-08 15:58:37 UTC (rev 23382) @@ -0,0 +1,94 @@ +Description: fix memory disclosure in TLS heartbeat extension +Origin: upstream, http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=96db9023b881d7cd9f379b0c154650d6c108e9a3 + +Index: openssl-1.0.1c/ssl/d1_both.c +=================================================================== +--- openssl-1.0.1c.orig/ssl/d1_both.c 2014-04-07 15:44:25.208340860 -0400 ++++ openssl-1.0.1c/ssl/d1_both.c 2014-04-07 15:44:25.204340860 -0400 +@@ -1458,26 +1458,36 @@ + unsigned int payload; + unsigned int padding = 16; /* Use minimum padding */ + +- /* Read type and payload length first */ +- hbtype = *p++; +- n2s(p, payload); +- pl = p; +- + if (s->msg_callback) + s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT, + &s->s3->rrec.data[0], s->s3->rrec.length, + s, s->msg_callback_arg); + ++ /* Read type and payload length first */ ++ if (1 + 2 + 16 > s->s3->rrec.length) ++ return 0; /* silently discard */ ++ hbtype = *p++; ++ n2s(p, payload); ++ if (1 + 2 + payload + 16 > s->s3->rrec.length) ++ return 0; /* silently discard per RFC 6520 sec. 4 */ ++ pl = p; ++ + if (hbtype == TLS1_HB_REQUEST) + { + unsigned char *buffer, *bp; ++ unsigned int write_length = 1 /* heartbeat type */ + ++ 2 /* heartbeat length */ + ++ payload + padding; + int r; + ++ if (write_length > SSL3_RT_MAX_PLAIN_LENGTH) ++ return 0; ++ + /* Allocate memory for the response, size is 1 byte + * message type, plus 2 bytes payload length, plus + * payload, plus padding + */ +- buffer = OPENSSL_malloc(1 + 2 + payload + padding); ++ buffer = OPENSSL_malloc(write_length); + bp = buffer; + + /* Enter response type, length and copy payload */ +@@ -1488,11 +1498,11 @@ + /* Random padding */ + RAND_pseudo_bytes(bp, padding); + +- r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload + padding); ++ r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, write_length); + + if (r >= 0 && s->msg_callback) + s->msg_callback(1, s->version, TLS1_RT_HEARTBEAT, +- buffer, 3 + payload + padding, ++ buffer, write_length, + s, s->msg_callback_arg); + + OPENSSL_free(buffer); +Index: openssl-1.0.1c/ssl/t1_lib.c +=================================================================== +--- openssl-1.0.1c.orig/ssl/t1_lib.c 2014-04-07 15:44:25.208340860 -0400 ++++ openssl-1.0.1c/ssl/t1_lib.c 2014-04-07 15:44:25.204340860 -0400 +@@ -2441,16 +2441,20 @@ + unsigned int payload; + unsigned int padding = 16; /* Use minimum padding */ + +- /* Read type and payload length first */ +- hbtype = *p++; +- n2s(p, payload); +- pl = p; +- + if (s->msg_callback) + s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT, + &s->s3->rrec.data[0], s->s3->rrec.length, + s, s->msg_callback_arg); + ++ /* Read type and payload length first */ ++ if (1 + 2 + 16 > s->s3->rrec.length) ++ return 0; /* silently discard */ ++ hbtype = *p++; ++ n2s(p, payload); ++ if (1 + 2 + payload + 16 > s->s3->rrec.length) ++ return 0; /* silently discard per RFC 6520 sec. 4 */ ++ pl = p; ++ + if (hbtype == TLS1_HB_REQUEST) + { + unsigned char *buffer, *bp; Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-04-08 13:45:24 UTC (rev 23381) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-04-08 15:58:37 UTC (rev 23382) @@ -1,3 +1,9 @@ +openssl (1.0.1g,rev=2014.04.08) unstable + + * 1.0.1g does not build. Revert to 1.0.1f and add backported changes. + + -- Maciej Blizinski Tue, 08 Apr 2014 16:07:48 +0100 + openssl (1.0.1g,rev=2014.04.07) unstable * New upstream release. 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 Apr 9 05:21:26 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 9 Apr 2014 03:21:26 +0000 Subject: SF.net SVN: gar:[23383] csw/mgar/pkg/pcre/trunk Message-ID: <3g3W3z4C14zPj@mail.opencsw.org> Revision: 23383 http://sourceforge.net/p/gar/code/23383 Author: dmichelsen Date: 2014-04-09 03:21:24 +0000 (Wed, 09 Apr 2014) Log Message: ----------- pcre/trunk: Update to 8.35, cleanup Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2014-04-08 15:58:37 UTC (rev 23382) +++ csw/mgar/pkg/pcre/trunk/Makefile 2014-04-09 03:21:24 UTC (rev 23383) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.33 +VERSION = 8.35 GARTYPE = v2 DESCRIPTION = Perl-compatible regular expression tools @@ -37,13 +37,6 @@ PKGFILES_CSWlibpcre-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibpcre-dev += $(docdir)/.* OBSOLETED_BY_CSWlibpcre-dev += CSWpcre-devel -# Leave these in the docs for now -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/pcre-config.txt -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/pcre.txt -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/README -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcre-config.html -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcresample.html -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcredemo.html # We don't want to depend on pcre CHECKPKG_OVERRIDES_CSWlibpcre-dev += missing-dependency|CSWpcre @@ -73,6 +66,12 @@ REINPLACE_USRLOCAL += doc/pcre-config.1 REINPLACE_USRLOCAL += doc/pcresample.3 +# Older compiler like Sun Studio 12 behave differently on -Wl,-i... and -Qoption ld -i... +# This leads to configure detecting something works which later on does not work. +# Newer compilers behave consistently. +# See also http://bugs.exim.org/show_bug.cgi?id=1278 +GARCOMPILER = SOS12U3 + BUILD64_LIBS_ONLY = 1 EXTRA_LINKER_FLAGS = -norunpath Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2014-04-08 15:58:37 UTC (rev 23382) +++ csw/mgar/pkg/pcre/trunk/checksums 2014-04-09 03:21:24 UTC (rev 23383) @@ -1 +1 @@ -21514018448ac10062ece7a668fca949 pcre-8.33.tar.bz2 +6aacb23986adccd9b3bc626c00979958 pcre-8.35.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 9 09:33:31 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 9 Apr 2014 07:33:31 +0000 Subject: SF.net SVN: gar:[23384] csw/mgar/pkg/389-ds-base/branches/vers1.3.2/ Makefile Message-ID: <3g3cfq5yBKzrQ@mail.opencsw.org> Revision: 23384 http://sourceforge.net/p/gar/code/23384 Author: cgrzemba Date: 2014-04-09 07:33:29 +0000 (Wed, 09 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: disable DEBUG Modified Paths: -------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-09 03:21:24 UTC (rev 23383) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-09 07:33:29 UTC (rev 23384) @@ -129,7 +129,7 @@ EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCOMPILER)) STRIP_LIBTOOL = 1 -GARFLAVOR = DBG +# GARFLAVOR = DBG CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ldapsdk-inc=$(includedir)/dirsrv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 9 11:20:00 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 9 Apr 2014 09:20:00 +0000 Subject: SF.net SVN: gar:[23385] csw/mgar/pkg/mozldap/trunk/Makefile Message-ID: <3g3g1j4nTwz16B@mail.opencsw.org> Revision: 23385 http://sourceforge.net/p/gar/code/23385 Author: cgrzemba Date: 2014-04-09 09:19:59 +0000 (Wed, 09 Apr 2014) Log Message: ----------- mozldap/trunk: fix configure options for GARFLAVOR Modified Paths: -------------- csw/mgar/pkg/mozldap/trunk/Makefile Modified: csw/mgar/pkg/mozldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/mozldap/trunk/Makefile 2014-04-09 07:33:29 UTC (rev 23384) +++ csw/mgar/pkg/mozldap/trunk/Makefile 2014-04-09 09:19:59 UTC (rev 23385) @@ -23,15 +23,18 @@ NSPR and NSS for crypto. endef -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src +MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += COPYING BUILD_DEP_PKGS = CSWlibsvrcore0-dev + PACKAGING_PLATFORMS += solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 -GARCOMPILER = SOS12U2 +GARCOMPILER = SOS12U3 +# GARFLAVOR = DBG + PACKAGES += CSWlibldap60 CATALOGNAME_CSWlibldap60 = libldap60 PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so) @@ -130,25 +133,28 @@ # header file namespace. # override the standard paths -bindir=$(prefix)/dirsrv/bin +bindir=$(prefix)/dirsrv/bin/$(MM_BINDIR) includedir=$(prefix)/include/dirsrv CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -CONFIGURE_ARGS_OPT += --with-svrcore=$(prefix) -CONFIGURE_ARGS_OPT += --with-sasl -CONFIGURE_ARGS_OPT += --with-sasl-inc=$(prefix)/include/sasl -CONFIGURE_ARGS_OPT += --with-sasl-lib=$(libdir) -CONFIGURE_ARGS_OPT += --enable-clu +CONFIGURE_ARGS += --with-svrcore=$(libdir) +CONFIGURE_ARGS += --with-sasl +CONFIGURE_ARGS += --with-sasl-inc=$(prefix)/include/sasl +CONFIGURE_ARGS += --with-sasl-lib=$(libdir) +CONFIGURE_ARGS += --enable-clu CONFIGURE_ARGS_OPT += --enable-optimize="-xO3" CONFIGURE_ARGS_OPT += --disable-debug CONFIGURE_ARGS_OPT += --enable-strip -CONFIGURE_ARGS_OPT += --with-nss-inc=$(prefix)/include/nss -CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir) -CONFIGURE_ARGS_OPT += --with-nspr-inc=$(prefix)/include/nspr -CONFIGURE_ARGS_OPT += --with-nspr-lib=$(libdir) +CONFIGURE_ARGS_DBG += --enable-optimize="no" +CONFIGURE_ARGS_DBG += --enable-debug +CONFIGURE_ARGS_DBG += --disable-strip +CONFIGURE_ARGS += --with-nss-inc=$(prefix)/include/nss +CONFIGURE_ARGS += --with-nss-lib=$(libdir) +CONFIGURE_ARGS += --with-nspr-inc=$(prefix)/include/nspr +CONFIGURE_ARGS += --with-nspr-lib=$(libdir) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CPPFLAGS= @@ -159,7 +165,11 @@ TEST_TARGET = TEST_SCRIPTS = BUILD64_LIBS_ONLY = 1 -EXTRA_LINKER_FLAGS = -liconv +# EXTRA_LINKER_FLAGS = -liconv +# remove -L/opt/csw/lib +LDFLAGS = $(CFLAGS) +EXTRA_BUILD_ENV_DBG += LDAP_DEBUG=1 +EXTRA_BUILD_ENV += $(EXTRA_BUILD_ENV_$(GARFLAVOR)) configure-c-sdk: (cd $(WORKSRC) && mkdir -p build inst) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 9 13:38:22 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 9 Apr 2014 11:38:22 +0000 Subject: SF.net SVN: gar:[23386] csw/mgar/pkg/mozldap/trunk/Makefile Message-ID: <3g3k5P0qcfz1Q5@mail.opencsw.org> Revision: 23386 http://sourceforge.net/p/gar/code/23386 Author: cgrzemba Date: 2014-04-09 11:38:20 +0000 (Wed, 09 Apr 2014) Log Message: ----------- mozldap/trunk: update recipe, minor changes Modified Paths: -------------- csw/mgar/pkg/mozldap/trunk/Makefile Modified: csw/mgar/pkg/mozldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/mozldap/trunk/Makefile 2014-04-09 09:19:59 UTC (rev 23385) +++ csw/mgar/pkg/mozldap/trunk/Makefile 2014-04-09 11:38:20 UTC (rev 23386) @@ -60,8 +60,6 @@ PKGFILES_CSWlibprldap60 += $(call baseisadirs,$(libdir),libprldap60\.so(\.\d+)*) SPKG_DESC_CSWlibprldap60 += $(DESCRIPTION), libprldap60.so RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibldap60 CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/libprldap60.so CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libprldap60.so @@ -78,7 +76,6 @@ RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibldap60 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibprldap60 -RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibsoftokn3 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibssl3 CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/libssldap60.so @@ -99,21 +96,12 @@ PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldapsearchprefs.conf) PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldaptemplates.conf) PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldapfriendly) -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssldap60 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibprldap60 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibldif60 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibldap60 +RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibprldap60 +RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsvrcore0 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsoftokn3 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssl3 -RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsasl2-2 -# it not depends on oldapclient! -CHECKPKG_OVERRIDES_CSWmozldap-tools += missing-dependency|CSWoldapclient +RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssldap60 PACKAGES += CSWmozldap-dev CATALOGNAME_CSWmozldap-dev = mozldap_dev @@ -121,7 +109,6 @@ PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWmozldap-dev = $(PKGFILES_DEVEL_INCLUDEDIR) PKGFILES_CSWmozldap-dev = $(PKGFILES_DEVEL_PKGCONFIG) -ARCHALL_CSWmozldap-dev = 1 RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibssldap60 RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibprldap60 RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibldif60 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 9 15:08:03 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 9 Apr 2014 13:08:03 +0000 Subject: SF.net SVN: gar:[23387] csw/mgar/pkg/mozldap/trunk/Makefile Message-ID: <3g3m4s3WXXz2X@mail.opencsw.org> Revision: 23387 http://sourceforge.net/p/gar/code/23387 Author: cgrzemba Date: 2014-04-09 13:08:01 +0000 (Wed, 09 Apr 2014) Log Message: ----------- mozldap/trunk: add sparc runtime dependencies Modified Paths: -------------- csw/mgar/pkg/mozldap/trunk/Makefile Modified: csw/mgar/pkg/mozldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/mozldap/trunk/Makefile 2014-04-09 11:38:20 UTC (rev 23386) +++ csw/mgar/pkg/mozldap/trunk/Makefile 2014-04-09 13:08:01 UTC (rev 23387) @@ -61,6 +61,8 @@ SPKG_DESC_CSWlibprldap60 += $(DESCRIPTION), libprldap60.so RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibldap60 +RUNTIME_DEP_PKGS_CSWlibprldap60_sparc += CSWlibplc4 +RUNTIME_DEP_PKGS_CSWlibprldap60 += $(RUNTIME_DEP_PKGS_CSWlibprldap60_$(GARCH)) CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/libprldap60.so CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libprldap60.so CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libprldap60.so @@ -77,6 +79,8 @@ RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibldap60 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibprldap60 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibssl3 +RUNTIME_DEP_PKGS_CSWlibssldap60_sparc += CSWlibsoftokn3 +RUNTIME_DEP_PKGS_CSWlibssldap60 += $(RUNTIME_DEP_PKGS_CSWlibssldap60_$(GARCH)) CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/libssldap60.so CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssldap60.so @@ -102,6 +106,9 @@ RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssldap60 +RUNTIME_DEP_PKGS_CSWmozldap-tools_sparc += CSWlibplds4 +RUNTIME_DEP_PKGS_CSWmozldap-tools_sparc += CSWlibplc4 +RUNTIME_DEP_PKGS_CSWmozldap-tools += $(RUNTIME_DEP_PKGS_CSWmozldap-tools_$(GARCH)) PACKAGES += CSWmozldap-dev CATALOGNAME_CSWmozldap-dev = mozldap_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Apr 10 08:23:34 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 10 Apr 2014 06:23:34 +0000 Subject: SF.net SVN: gar:[23388] csw/mgar/pkg/389-ds-base/branches/vers1.3.2/ Makefile Message-ID: <3g4C3n70h5z1Y2@mail.opencsw.org> Revision: 23388 http://sourceforge.net/p/gar/code/23388 Author: cgrzemba Date: 2014-04-10 06:23:34 +0000 (Thu, 10 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: adapt runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-09 13:08:01 UTC (rev 23387) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-10 06:23:34 UTC (rev 23388) @@ -25,7 +25,10 @@ LICENSE = LICENSE GARCOMPILER = SOS12U3 +# builds but was not able to debug # GARCOMPILER = GCC4 +LDAPAPI=mozldap +# LDAPAPI=openldap PATCHFILES += 0005-add-standard-path.patch PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch @@ -96,18 +99,30 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-netaddr-ip -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n52 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap-r2-4-2 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWlibldap2-4-2 + +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibprldap60 +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibldif60 +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibldap60 +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibssldap60 + RUNTIME_DEP_PKGS_CSW389-ds-base_sparc += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSW389-ds-base_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSW389-ds-base_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSW389-ds-base_sparc_GCC4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW389-ds-base_sparc_GCC4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW389-ds-base += $(RUNTIME_DEP_PKGS_CSW389-ds-base_$(GARCH)) +RUNTIME_DEP_PKGS_CSW389-ds-base += $(RUNTIME_DEP_PKGS_CSW389-ds-base_$(GARCH)_$(GARCOMPILER)) +RUNTIME_DEP_PKGS_CSW389-ds-base += $(RUNTIME_DEP_PKGS_CSW389-ds-base_$(LDAPAPI)) +# it is only a comment CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm +CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/dirsrv/perl/DSUpdate.pm CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none # is needed for setup scripts! @@ -134,7 +149,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ldapsdk-inc=$(includedir)/dirsrv CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir) -CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR)) +CONFIGURE_ARGS += --with-ldapsdk-bin=$(prefix)/dirsrv/bin # CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir) # CONFIGURE_ARGS += --with-openldap=$(prefix) # CONFIGURE_ARGS += --with-openldap-inc=$(includedir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Apr 10 15:44:18 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 10 Apr 2014 13:44:18 +0000 Subject: SF.net SVN: gar:[23389] csw/mgar/pkg/389-ds-base/branches/vers1.3.2/ Makefile Message-ID: <3g4NrC3cM5zfT@mail.opencsw.org> Revision: 23389 http://sourceforge.net/p/gar/code/23389 Author: cgrzemba Date: 2014-04-10 13:44:16 +0000 (Thu, 10 Apr 2014) Log Message: ----------- 389-ds-base/branches/vers1.3.2: adapt runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-10 06:23:34 UTC (rev 23388) +++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile 2014-04-10 13:44:16 UTC (rev 23389) @@ -123,6 +123,7 @@ # it is only a comment CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/dirsrv/perl/DSUpdate.pm +CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/dirsrv/perl/DSUpdate.pm CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none # is needed for setup scripts! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 11 01:20:13 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Apr 2014 23:20:13 +0000 Subject: SF.net SVN: gar:[23390] csw/mgar/pkg/tmpwatch/trunk/Makefile Message-ID: <3g4dcj43MqzCq@mail.opencsw.org> Revision: 23390 http://sourceforge.net/p/gar/code/23390 Author: wahwah Date: 2014-04-10 23:20:12 +0000 (Thu, 10 Apr 2014) Log Message: ----------- tmpwatch/trunk: Build on Solaris 9; for rebuilding Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2014-04-10 13:44:16 UTC (rev 23389) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2014-04-10 23:20:12 UTC (rev 23390) @@ -7,14 +7,14 @@ The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time. tmpwatch is normally used to clean up directories which are used - for temporarily holding files (for example, /tmp). + for temporarily holding files (for example, /tmp). endef VENDOR_URL = https://fedorahosted.org/tmpwatch/ MASTER_SITES = https://fedorahosted.org/releases/t/m/tmpwatch/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Apr 11 08:27:26 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Apr 2014 06:27:26 +0000 Subject: SF.net SVN: gar:[23391] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: <3g4q5n0NdQzXL@mail.opencsw.org> Revision: 23391 http://sourceforge.net/p/gar/code/23391 Author: cgrzemba Date: 2014-04-11 06:27:24 +0000 (Fri, 11 Apr 2014) Log Message: ----------- 389-admin/trunk: update runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2014-04-10 23:20:12 UTC (rev 23390) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2014-04-11 06:27:24 UTC (rev 23391) @@ -64,24 +64,33 @@ INITSMF = /etc/opt/csw/init.d/dirsrv-admin RUNTIME_DEP_PKGS_CSW389-admin += CSWap2worker RUNTIME_DEP_PKGS_CSW389-admin += CSWap2modnss -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60 +# RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60 RUNTIME_DEP_PKGS_CSW389-admin += CSWperl RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadmsslutil0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplc4 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnspr4 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibds-admin-serv0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadminutil0 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap60 +# RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap60 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsmime3 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssl3 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnss3 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console RUNTIME_DEP_PKGS_CSW389-admin += CSW389-ds-console RUNTIME_DEP_PKGS_CSW389-admin += CSWpm-netaddr-ip +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplds4 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicudata52 + CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2worker CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-admin-console CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-ds-console +CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWpm-netaddr-ip # hint from Maciej: let checkpkg fail the check at the package build stage. If this was the only error shown, you know that it will go away when you upload the right set of packages, so you can upload safely. # CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-admin-console # CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-ds-console This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Apr 11 09:13:49 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Apr 2014 07:13:49 +0000 Subject: SF.net SVN: gar:[23392] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: <3g4r792l0dzd8@mail.opencsw.org> Revision: 23392 http://sourceforge.net/p/gar/code/23392 Author: cgrzemba Date: 2014-04-11 07:13:44 +0000 (Fri, 11 Apr 2014) Log Message: ----------- 389-admin/trunk: update runtime dependencies arch depended Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2014-04-11 06:27:24 UTC (rev 23391) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2014-04-11 07:13:44 UTC (rev 23392) @@ -78,13 +78,14 @@ RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console RUNTIME_DEP_PKGS_CSW389-admin += CSW389-ds-console RUNTIME_DEP_PKGS_CSW389-admin += CSWpm-netaddr-ip -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplds4 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicuuc52 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibplds4 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(GARCH)) CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2worker This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Apr 11 09:30:20 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Apr 2014 07:30:20 +0000 Subject: SF.net SVN: gar:[23393] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: <3g4rVF0NBFzhy@mail.opencsw.org> Revision: 23393 http://sourceforge.net/p/gar/code/23393 Author: cgrzemba Date: 2014-04-11 07:30:19 +0000 (Fri, 11 Apr 2014) Log Message: ----------- 389-admin/trunk: remove stub package reference Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2014-04-11 07:13:44 UTC (rev 23392) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2014-04-11 07:30:19 UTC (rev 23393) @@ -53,7 +53,7 @@ RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibiconv2 PACKAGES += CSW389-admin-dev -OBSOLETED_BY_CSW389-admin-dev = CSW389admin-dev +# OBSOLETED_BY_CSW389-admin-dev = CSW389admin-dev SPKG_DESC_CSW389-admin-dev += $(DESCRIPTION), development files PKGFILES_CSW389-admin-dev += /opt/csw/lib/libds-admin-serv.so RUNTIME_DEP_PKGS_CSW389-admin-dev += CSWlibds-admin-serv0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Apr 11 10:57:12 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Apr 2014 08:57:12 +0000 Subject: SF.net SVN: gar:[23394] csw/mgar/pkg/389-ds-base/trunk Message-ID: <3g4tR767rQzsD@mail.opencsw.org> Revision: 23394 http://sourceforge.net/p/gar/code/23394 Author: cgrzemba Date: 2014-04-11 08:57:11 +0000 (Fri, 11 Apr 2014) Log Message: ----------- 389-ds-base/trunk: merge branch vers1.3.2 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch Added Paths: ----------- csw/mgar/pkg/389-ds-base/trunk/files/0006-remove-bashism-in-shell-templates.patch csw/mgar/pkg/389-ds-base/trunk/files/0010-no-Crun-Cstd-lib-config.ac.patch csw/mgar/pkg/389-ds-base/trunk/files/0015-use-PL_strcasestr-acllas.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0016-fix-bigendian-utf8compare.c csw/mgar/pkg/389-ds-base/trunk/files/0017-disable-asm-for-Sparc.patch csw/mgar/pkg/389-ds-base/trunk/files/0018-correct-64bit-ptr-bind.c csw/mgar/pkg/389-ds-base/trunk/files/0019-void-ptr-conntable.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0020-debug-label-main.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0021-include-lber.h-slapi-plugin.h.patch csw/mgar/pkg/389-ds-base/trunk/files/0022-adjust-mozldap-version-sasl_io.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0023-phtread-include-slapi2nspr.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0024-strndup.patch csw/mgar/pkg/389-ds-base/trunk/files/0025-posix-winsync.rawentry.patch csw/mgar/pkg/389-ds-base/trunk/files/0026-handle-delete-memberuid-posix-winsync.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0027-Slapi-rwlock-size.patch csw/mgar/pkg/389-ds-base/trunk/files/0030-reconstruct-memberuid-generation-task.patch Property Changed: ---------------- csw/mgar/pkg/389-ds-base/trunk/ Index: csw/mgar/pkg/389-ds-base/trunk =================================================================== --- csw/mgar/pkg/389-ds-base/trunk 2014-04-11 07:30:19 UTC (rev 23393) +++ csw/mgar/pkg/389-ds-base/trunk 2014-04-11 08:57:11 UTC (rev 23394) Property changes on: csw/mgar/pkg/389-ds-base/trunk ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +1 ## +/csw/mgar/pkg/389-ds-base/branches/vers1.3.2:23147-23393 \ No newline at end of property Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2014-04-11 07:30:19 UTC (rev 23393) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2014-04-11 08:57:11 UTC (rev 23394) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-ds-base -VERSION = 1.2.11.25 +VERSION = 1.3.2.14 GARTYPE = v2 DESCRIPTION = The enterprise-class Open Source LDAP server @@ -12,25 +12,30 @@ BUNDLE = 389-ds -MASTER_SITES = http://port389.org/sources/ +MASTER_SITES = https://git.fedorahosted.org/cgit/389/ds.git/snapshot/ +# MASTER_SITES = http://port389.org/sources/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += CSW389-ds-base.postinstall DISTFILES += CSW389-ds-base.postremove -# BUILD64 = 1 +BUILD64 = 1 PACKAGING_PLATFORMS += solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 LICENSE = LICENSE GARCOMPILER = SOS12U3 +# builds but was not able to debug +# GARCOMPILER = GCC4 +LDAPAPI=mozldap +# LDAPAPI=openldap PATCHFILES += 0005-add-standard-path.patch PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch -# PATCHFILES += 0006-remove-bashism-in-shell-templates.patch PATCHFILES += 0005-smf-autoenable-no.patch PATCHFILES += 0005-add-var-run-create-initconfig.in.patch PATCHFILES += 0005-add-var-run-create-template-initconfig.in.patch +PATCHFILES += 0006-remove-bashism-in-shell-templates.patch PATCHFILES += 0007-fixup-Makefile.am.patch # PATCHFILES += 0007-fixup-plugin_syntax.c.patch PATCHFILES += 0008-mntent-daemon.c.patch @@ -39,17 +44,34 @@ # PATCHFILES += 0011-Makefile.am.patch # PATCHFILES += 0009-fix-for-550-memberuid-not-created.patch # PATCHFILES += 0012-fix-for-47327.patch + +# PATCHFILES += 0013-use-posix-threads-configure.ac.patch +# PATCHFILES += 0023-phtread-include-slapi2nspr.c.patch +PATCHFILES += 0027-Slapi-rwlock-size.patch + PATCHFILES += 0014-ldap-include-Makefile.am.patch +# needed at least on GCC4 +PATCHFILES += 0015-use-PL_strcasestr-acllas.c.patch +PATCHFILES_GCC4 += 0010-no-Crun-Cstd-lib-config.ac.patch +PATCHFILES += 0016-fix-bigendian-utf8compare.c +PATCHFILES += 0017-disable-asm-for-Sparc.patch +# probably only with openLDAP +PATCHFILES += 0018-correct-64bit-ptr-bind.c +PATCHFILES += 0021-include-lber.h-slapi-plugin.h.patch +PATCHFILES += 0022-adjust-mozldap-version-sasl_io.c.patch +PATCHFILES += 0024-strndup.patch +PATCHFILES += 0025-posix-winsync.rawentry.patch +PATCHFILES += 0030-reconstruct-memberuid-generation-task.patch +PATCHFILES += $(PATCHFILES_$(GARCOMPILER)) - BUILD_DEP_PKGS += CSWautoconf BUILD_DEP_PKGS += CSWautomake BUILD_DEP_PKGS += CSWbdb48devel BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWlibnss-dev BUILD_DEP_PKGS += CSWnetsnmp-dev -# BUILD_DEP_PKGS += CSWmozldap-dev -BUILD_DEP_PKGS += CSWmozldap-tools +# BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWmozldap-dev BUILD_DEP_PKGS += CSWsasl-dev BUILD_DEP_PKGS += CSWlibicu-dev BUILD_DEP_PKGS += CSWlibsvrcore0-dev @@ -77,18 +99,31 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-netaddr-ip -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n52 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap-r2-4-2 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWlibldap2-4-2 + +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibprldap60 +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibldif60 +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibldap60 +RUNTIME_DEP_PKGS_CSW389-ds-base_mozldap += CSWlibssldap60 + RUNTIME_DEP_PKGS_CSW389-ds-base_sparc += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSW389-ds-base_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSW389-ds-base_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSW389-ds-base_sparc_GCC4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW389-ds-base_sparc_GCC4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW389-ds-base += $(RUNTIME_DEP_PKGS_CSW389-ds-base_$(GARCH)) +RUNTIME_DEP_PKGS_CSW389-ds-base += $(RUNTIME_DEP_PKGS_CSW389-ds-base_$(GARCH)_$(GARCOMPILER)) +RUNTIME_DEP_PKGS_CSW389-ds-base += $(RUNTIME_DEP_PKGS_CSW389-ds-base_$(LDAPAPI)) +# it is only a comment CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm +CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/dirsrv/perl/DSUpdate.pm +CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/dirsrv/perl/DSUpdate.pm CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none # is needed for setup scripts! @@ -100,19 +135,25 @@ EXTRA_LIB = /opt/csw/bdb48/lib -# remove -I/opt/csw/include +# if use MozillaLDAP remove -I/opt/csw/include because there are OpenLDAP header CPPFLAGS = -EXTRA_LINKER_FLAGS = -xnorunpath -norunpath +EXTRA_CFLAGS_SOS12U3 = -xnorunpath +EXTRA_CXXFLAGS_SOS12U3 = -norunpath +EXTRA_CPPFLAGS_GCC4 = -DSOLARIS_GCC +EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS_$(GARCOMPILER)) +EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS_$(GARCOMPILER)) +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCOMPILER)) +STRIP_LIBTOOL = 1 -GARFLAVOR = DBG +# GARFLAVOR = DBG CONFIGURE_ARGS = $(DIRPATHS) -# CONFIGURE_ARGS += --with-ldapsdk-inc=$(includedir)/dirsrv -# CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir) -## CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR)) +CONFIGURE_ARGS += --with-ldapsdk-inc=$(includedir)/dirsrv +CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir) +CONFIGURE_ARGS += --with-ldapsdk-bin=$(prefix)/dirsrv/bin # CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir) -CONFIGURE_ARGS += --with-openldap=$(prefix) -CONFIGURE_ARGS += --with-openldap-inc=$(includedir) +# CONFIGURE_ARGS += --with-openldap=$(prefix) +# CONFIGURE_ARGS += --with-openldap-inc=$(includedir) CONFIGURE_ARGS += --with-db-inc=$(prefix)/bdb48/include CONFIGURE_ARGS += --with-db-lib=$(abspath $(prefix)/bdb48/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --with-icu-inc=$(includedir) Copied: csw/mgar/pkg/389-ds-base/trunk/files/0006-remove-bashism-in-shell-templates.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0006-remove-bashism-in-shell-templates.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0006-remove-bashism-in-shell-templates.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0006-remove-bashism-in-shell-templates.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,263 @@ +From 76daf2857988a218400fe4d7c747862118112700 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Wed, 5 Mar 2014 11:14:22 +0100 +Subject: [PATCH 2/2] remove bashism in shell templates + +--- + ldap/admin/src/scripts/bak2db.in | 4 ++-- + ldap/admin/src/scripts/db2bak.in | 4 ++-- + ldap/admin/src/scripts/db2index.in | 4 ++-- + ldap/admin/src/scripts/db2ldif.in | 4 ++-- + ldap/admin/src/scripts/dbverify.in | 4 ++-- + ldap/admin/src/scripts/dn2rdn.in | 4 ++-- + ldap/admin/src/scripts/ldif2db.in | 4 ++-- + ldap/admin/src/scripts/ldif2ldap.in | 4 ++-- + ldap/admin/src/scripts/monitor.in | 4 ++-- + ldap/admin/src/scripts/restart-dirsrv.in | 2 +- + ldap/admin/src/scripts/restoreconfig.in | 4 ++-- + ldap/admin/src/scripts/saveconfig.in | 4 ++-- + ldap/admin/src/scripts/start-dirsrv.in | 2 +- + ldap/admin/src/scripts/stop-dirsrv.in | 2 +- + ldap/admin/src/scripts/suffix2instance.in | 4 ++-- + ldap/admin/src/scripts/upgradedb.in | 4 ++-- + ldap/admin/src/scripts/upgradednformat.in | 4 ++-- + ldap/admin/src/scripts/vlvindex.in | 4 ++-- + 18 files changed, 33 insertions(+), 33 deletions(-) + +diff --git a/ldap/admin/src/scripts/bak2db.in b/ldap/admin/src/scripts/bak2db.in +index f0cede4..b7ff1a7 100755 +--- a/ldap/admin/src/scripts/bak2db.in ++++ b/ldap/admin/src/scripts/bak2db.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/db2bak.in b/ldap/admin/src/scripts/db2bak.in +index dacd7b0..4394100 100755 +--- a/ldap/admin/src/scripts/db2bak.in ++++ b/ldap/admin/src/scripts/db2bak.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/db2index.in b/ldap/admin/src/scripts/db2index.in +index a1321ea..9d42b1a 100755 +--- a/ldap/admin/src/scripts/db2index.in ++++ b/ldap/admin/src/scripts/db2index.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/db2ldif.in b/ldap/admin/src/scripts/db2ldif.in +index d7e0ff0..a3e6ed6 100755 +--- a/ldap/admin/src/scripts/db2ldif.in ++++ b/ldap/admin/src/scripts/db2ldif.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/dbverify.in b/ldap/admin/src/scripts/dbverify.in +index 6306a07..a5258d7 100755 +--- a/ldap/admin/src/scripts/dbverify.in ++++ b/ldap/admin/src/scripts/dbverify.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/dn2rdn.in b/ldap/admin/src/scripts/dn2rdn.in +index 32a70c8..5a38dc0 100755 +--- a/ldap/admin/src/scripts/dn2rdn.in ++++ b/ldap/admin/src/scripts/dn2rdn.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/ldif2db.in b/ldap/admin/src/scripts/ldif2db.in +index ce15349..7763c04 100755 +--- a/ldap/admin/src/scripts/ldif2db.in ++++ b/ldap/admin/src/scripts/ldif2db.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/ldif2ldap.in b/ldap/admin/src/scripts/ldif2ldap.in +index 874b1bb..bc3840f 100755 +--- a/ldap/admin/src/scripts/ldif2ldap.in ++++ b/ldap/admin/src/scripts/ldif2ldap.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@ldapsdk_libdir@" + libpath_add "@libdir@" +diff --git a/ldap/admin/src/scripts/monitor.in b/ldap/admin/src/scripts/monitor.in +index 7b2058b..4bb51b1 100755 +--- a/ldap/admin/src/scripts/monitor.in ++++ b/ldap/admin/src/scripts/monitor.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@ldapsdk_libdir@" +diff --git a/ldap/admin/src/scripts/restart-dirsrv.in b/ldap/admin/src/scripts/restart-dirsrv.in +index 270b71b..4dfb8ed 100644 +--- a/ldap/admin/src/scripts/restart-dirsrv.in ++++ b/ldap/admin/src/scripts/restart-dirsrv.in +@@ -7,7 +7,7 @@ + # 2: Server started successfully (was not running) + # 3: Server could not be stopped + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + restart_instance() { + SERV_ID=$1 +diff --git a/ldap/admin/src/scripts/restoreconfig.in b/ldap/admin/src/scripts/restoreconfig.in +index 9bb1acf..c500e21 100755 +--- a/ldap/admin/src/scripts/restoreconfig.in ++++ b/ldap/admin/src/scripts/restoreconfig.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@nss_libdir@" +diff --git a/ldap/admin/src/scripts/saveconfig.in b/ldap/admin/src/scripts/saveconfig.in +index 65d80f3..55b3a3c 100755 +--- a/ldap/admin/src/scripts/saveconfig.in ++++ b/ldap/admin/src/scripts/saveconfig.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@libdir@" +diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in +index a5c1bf6..ebc5c50 100755 +--- a/ldap/admin/src/scripts/start-dirsrv.in ++++ b/ldap/admin/src/scripts/start-dirsrv.in +@@ -6,7 +6,7 @@ + # 1: Server could not be started + # 2: Server already running + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + # Starts a single instance + start_instance() { +diff --git a/ldap/admin/src/scripts/stop-dirsrv.in b/ldap/admin/src/scripts/stop-dirsrv.in +index 5cf126b..278af70 100755 +--- a/ldap/admin/src/scripts/stop-dirsrv.in ++++ b/ldap/admin/src/scripts/stop-dirsrv.in +@@ -6,7 +6,7 @@ + # 1: Server could not be stopped + # 2: Server was not running + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + stop_instance() { + SERV_ID=$1 +diff --git a/ldap/admin/src/scripts/suffix2instance.in b/ldap/admin/src/scripts/suffix2instance.in +index e2f73c3..5507bb6 100755 +--- a/ldap/admin/src/scripts/suffix2instance.in ++++ b/ldap/admin/src/scripts/suffix2instance.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@libdir@" +diff --git a/ldap/admin/src/scripts/upgradedb.in b/ldap/admin/src/scripts/upgradedb.in +index 211bdce..8a941f4 100755 +--- a/ldap/admin/src/scripts/upgradedb.in ++++ b/ldap/admin/src/scripts/upgradedb.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@libdir@" +diff --git a/ldap/admin/src/scripts/upgradednformat.in b/ldap/admin/src/scripts/upgradednformat.in +index e9d8cab..30a5eb9 100755 +--- a/ldap/admin/src/scripts/upgradednformat.in ++++ b/ldap/admin/src/scripts/upgradednformat.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + # upgradednformat -- upgrade DN format to the new style (RFC 4514) + # Usgae: upgradednformat [-N] -n backend_instance -a db_instance_directory +diff --git a/ldap/admin/src/scripts/vlvindex.in b/ldap/admin/src/scripts/vlvindex.in +index 0b46b27..175c618 100755 +--- a/ldap/admin/src/scripts/vlvindex.in ++++ b/ldap/admin/src/scripts/vlvindex.in +@@ -1,6 +1,6 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + +-source @datadir@/@package_name@/data/DSSharedLib ++. @datadir@/@package_name@/data/DSSharedLib + + libpath_add "@libdir@/@package_name@/" + libpath_add "@libdir@" +-- +1.8.4.1 + Copied: csw/mgar/pkg/389-ds-base/trunk/files/0010-no-Crun-Cstd-lib-config.ac.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0010-no-Crun-Cstd-lib-config.ac.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0010-no-Crun-Cstd-lib-config.ac.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0010-no-Crun-Cstd-lib-config.ac.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,14 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -570,9 +570,9 @@ dnl socket nsl and dl are required to link several programs and libdb + LIBDL=-ldl + AC_SUBST([LIBDL], [$LIBDL]) + dnl Cstd and Crun are required to link any C++ related code +- LIBCSTD=-lCstd ++ LIBCSTD= + AC_SUBST([LIBCSTD], [$LIBCSTD]) +- LIBCRUN=-lCrun ++ LIBCRUN= + AC_SUBST([LIBCRUN], [$LIBCRUN]) + platform="solaris" + initdir='$(sysconfdir)/init.d' Modified: csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch 2014-04-11 07:30:19 UTC (rev 23393) +++ csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -9,3 +9,14 @@ # We need to make sure that libpthread is linked before libc on HP-UX. if HPUX AM_LDFLAGS = -lpthread +--- a/Makefile.am ++++ b/Makefile.am +@@ -1362,7 +1362,7 @@ ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \ + ldap/servers/snmp/ldap-agent.c \ + ldap/servers/slapd/agtmmap.c + +-ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ ++ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @openldap_inc@ @ldapsdk_inc@ @netsnmp_inc@ @nss_inc@ @nspr_inc@ + ldap_agent_bin_LDADD = $(LDAPSDK_LINK_NOTHR) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK) $(THREADLIB) + if SOLARIS + ldap_agent_bin_LDADD += -lrt Copied: csw/mgar/pkg/389-ds-base/trunk/files/0015-use-PL_strcasestr-acllas.c.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0015-use-PL_strcasestr-acllas.c.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0015-use-PL_strcasestr-acllas.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0015-use-PL_strcasestr-acllas.c.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,138 @@ +--- a/ldap/servers/plugins/acl/acllas.c ++++ b/ldap/servers/plugins/acl/acllas.c +@@ -584,9 +584,9 @@ DS_LASUserDnEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator, + } else { + /* URL format */ + +- if ((strcasestr (user, ACL_RULE_MACRO_DN_KEY) != NULL) || +- (strcasestr (user, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || +- (strcasestr (user, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { ++ if ((PL_strcasestr (user, ACL_RULE_MACRO_DN_KEY) != NULL) || ++ (PL_strcasestr (user, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || ++ (PL_strcasestr (user, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { + + matched = aclutil_evaluate_macro( s_user, &lasinfo, + ACL_EVAL_USER); +@@ -856,9 +856,9 @@ DS_LASGroupDnEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator, + "Group not evaluated(%s)\n", groupName); + break; + } else { +- if ((strcasestr (groupName, ACL_RULE_MACRO_DN_KEY) != NULL) || +- (strcasestr (groupName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || +- (strcasestr (groupName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { ++ if ((PL_strcasestr (groupName, ACL_RULE_MACRO_DN_KEY) != NULL) || ++ (PL_strcasestr (groupName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || ++ (PL_strcasestr (groupName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { + matched = aclutil_evaluate_macro( groupName, &lasinfo, + ACL_EVAL_GROUP); + slapi_log_error ( SLAPI_LOG_ACL, plugin_name, +@@ -1075,9 +1075,9 @@ DS_LASRoleDnEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator, + } else { + + /* Take care of param strings */ +- if ((strcasestr (role, ACL_RULE_MACRO_DN_KEY) != NULL) || +- (strcasestr (role, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || +- (strcasestr (role, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { ++ if ((PL_strcasestr (role, ACL_RULE_MACRO_DN_KEY) != NULL) || ++ (PL_strcasestr (role, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || ++ (PL_strcasestr (role, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { + + matched = aclutil_evaluate_macro( role, &lasinfo, + ACL_EVAL_ROLE); +@@ -2630,9 +2630,9 @@ DS_LASGroupDnAttrEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator, + + /* In this case "grppupdnattr="ldap:///base??attr" */ + +- if ((strcasestr (attrName, ACL_RULE_MACRO_DN_KEY) != NULL) || +- (strcasestr (attrName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || +- (strcasestr (attrName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { ++ if ((PL_strcasestr (attrName, ACL_RULE_MACRO_DN_KEY) != NULL) || ++ (PL_strcasestr (attrName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) || ++ (PL_strcasestr (attrName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) { + + matched = aclutil_evaluate_macro( attrName, &lasinfo, + ACL_EVAL_GROUPDNATTR); +@@ -4203,12 +4203,12 @@ acllas_replace_dn_macro( char *rule, char *matched_val, lasInfo *lasinfo) { + int has_macro_levels = 0; + + /* Determine what the rule's got once */ +- if ( strcasestr(rule, ACL_RULE_MACRO_DN_KEY) != NULL) { ++ if ( PL_strcasestr(rule, ACL_RULE_MACRO_DN_KEY) != NULL) { + /* ($dn) exists */ + has_macro_dn = 1; + } + +- if ( strcasestr(rule, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) { ++ if ( PL_strcasestr(rule, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) { + /* [$dn] exists */ + has_macro_levels = 1; + } +@@ -4312,7 +4312,7 @@ acllas_replace_attr_macro( char *rule, lasInfo *lasinfo) + int l; + Slapi_Attr *attr = NULL; + +- str = strcasestr(rule, ACL_RULE_MACRO_ATTR_KEY); ++ str = PL_strcasestr(rule, ACL_RULE_MACRO_ATTR_KEY); + if ( str == NULL ) { + + charray_add(&a, slapi_ch_strdup(rule)); +@@ -4321,7 +4321,7 @@ acllas_replace_attr_macro( char *rule, lasInfo *lasinfo) + } else { + + working_rule = slapi_ch_strdup(rule); +- str = strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY); ++ str = PL_strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY); + charray_add(&working_list, working_rule ); + + while( str != NULL) { +@@ -4419,7 +4419,7 @@ acllas_replace_attr_macro( char *rule, lasInfo *lasinfo) + slapi_ch_free_string(¯o_str); + slapi_ch_free_string(¯o_attr_name); + +- str = strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY); ++ str = PL_strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY); + + }/* while */ + +--- a/ldap/servers/plugins/acl/aclparse.c ++++ b/ldap/servers/plugins/acl/aclparse.c +@@ -315,8 +315,8 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf) + * have a target and it must have a macro. + */ + +- if ((strcasestr(str, ACL_RULE_MACRO_DN_KEY) != NULL) || +- (strcasestr(str, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL)) { ++ if ((PL_strcasestr(str, ACL_RULE_MACRO_DN_KEY) != NULL) || ++ (PL_strcasestr(str, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL)) { + + /* Must have a targetmacro */ + if ( !(aci_item->aci_type & ACI_TARGET_MACRO_DN)) { +--- a/ldap/servers/plugins/acl/aclutil.c ++++ b/ldap/servers/plugins/acl/aclutil.c +@@ -1247,7 +1247,7 @@ acl_replace_str(char * s, char *substr, char* replace_with_str) { + char *working_s, *suffix, *prefix, *patched; + int replace_with_len, substr_len, prefix_len, suffix_len; + +- if (strcasestr(s, substr) == NULL) { ++ if (PL_strcasestr(s, substr) == NULL) { + return(slapi_ch_strdup(s)); + } else { + +@@ -1257,7 +1257,7 @@ acl_replace_str(char * s, char *substr, char* replace_with_str) { + + working_s = slapi_ch_strdup(s); + prefix = working_s; +- str = strcasestr(prefix, substr); ++ str = PL_strcasestr(prefix, substr); + + while (str != NULL) { + +@@ -1284,7 +1284,7 @@ acl_replace_str(char * s, char *substr, char* replace_with_str) { + + working_s = patched; + prefix = working_s; +- str = strcasestr(prefix, substr); ++ str = PL_strcasestr(prefix, substr); + + } + Copied: csw/mgar/pkg/389-ds-base/trunk/files/0016-fix-bigendian-utf8compare.c (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0016-fix-bigendian-utf8compare.c) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0016-fix-bigendian-utf8compare.c (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0016-fix-bigendian-utf8compare.c 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,34 @@ +--- a/ldap/servers/slapd/utf8compare.c ++++ b/ldap/servers/slapd/utf8compare.c +@@ -60,6 +60,7 @@ typedef struct sUpperLowerTbl { + int + slapi_has8thBit(unsigned char *s) + { ++#if (defined(CPU_x86) || defined(CPU_x86_64)) + #define MY8THBITWIDTH 4 /* sizeof(PRUint32) */ + #define MY8THBITFILTER 0x80808080 + unsigned char *p, *stail, *ltail; +@@ -73,14 +74,20 @@ slapi_has8thBit(unsigned char *s) + return 1; + } + } +- for (; p < ltail; p++) { ++#undef MY8THBITWIDTH ++#undef MY8THBITFILTER ++ for (; p < ltail; p++) ++#else ++ unsigned char *p, *tail; ++ tail = s + strlen((char *)s); ++ for (p = s; p < tail; p++) ++#endif ++ { + if (0x80 & *p) { + return 1; + } + } + return 0; +-#undef MY8THBITWIDTH +-#undef MY8THBITFILTER + } + + /* Copied: csw/mgar/pkg/389-ds-base/trunk/files/0017-disable-asm-for-Sparc.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0017-disable-asm-for-Sparc.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0017-disable-asm-for-Sparc.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0017-disable-asm-for-Sparc.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -583,7 +583,6 @@ dnl I dont know why i386 need this explicit + ;; + sparc-*-solaris*) + dnl includes some assembler stuff in counter.o +- AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) + AC_DEFINE([CPU_sparc], [], [cpu type sparc]) + TARGET='SPARC' + ;; Copied: csw/mgar/pkg/389-ds-base/trunk/files/0018-correct-64bit-ptr-bind.c (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0018-correct-64bit-ptr-bind.c) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0018-correct-64bit-ptr-bind.c (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0018-correct-64bit-ptr-bind.c 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,30 @@ +--- a/ldap/servers/slapd/bind.c ++++ b/ldap/servers/slapd/bind.c +@@ -119,7 +119,8 @@ do_bind( Slapi_PBlock *pb ) + { + BerElement *ber = pb->pb_op->o_ber; + int err, isroot; +- ber_tag_t method = LBER_DEFAULT; ++ ber_tag_t ber_method = LBER_DEFAULT; ++ int method = 0; + ber_int_t version = -1; + int auth_response_requested = 0; + int pw_response_requested = 0; +@@ -162,7 +163,7 @@ do_bind( Slapi_PBlock *pb ) + * } + */ + +- ber_rc = ber_scanf( ber, "{iat", &version, &rawdn, &method ); ++ ber_rc = ber_scanf( ber, "{iat", &version, &rawdn, &ber_method ); + if ( ber_rc == LBER_ERROR ) { + LDAPDebug( LDAP_DEBUG_ANY, + "ber_scanf failed (op=Bind; params=Version,DN,Method)\n", +@@ -173,6 +174,8 @@ do_bind( Slapi_PBlock *pb ) + slapi_ch_free_string(&rawdn); + return; + } ++ /* (int) = (long) */ ++ method = (int)(ber_method & 0xffff); + /* Check if we should be performing strict validation. */ + if (rawdn && config_get_dn_validate_strict()) { + /* check that the dn is formatted correctly */ Copied: csw/mgar/pkg/389-ds-base/trunk/files/0019-void-ptr-conntable.c.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0019-void-ptr-conntable.c.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0019-void-ptr-conntable.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0019-void-ptr-conntable.c.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,18 @@ +--- a/ldap/servers/slapd/conntable.c ++++ b/ldap/servers/slapd/conntable.c +@@ -50,6 +50,7 @@ connection_table_new(int table_size) + Connection_Table *ct; + int i = 0; + ber_len_t maxbersize = config_get_maxbersize(); ++ LBER_SOCKET invalid_socket; + + ct= (Connection_Table*)slapi_ch_calloc( 1, sizeof(Connection_Table) ); + ct->size= table_size; +@@ -62,7 +63,6 @@ connection_table_new(int table_size) + */ + for ( i = 0; i < table_size; i++ ) + { +- LBER_SOCKET invalid_socket; + /* DBDB---move this out of here once everything works */ + ct->c[i].c_sb = ber_sockbuf_alloc(); + invalid_socket = SLAPD_INVALID_SOCKET; Copied: csw/mgar/pkg/389-ds-base/trunk/files/0020-debug-label-main.c.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0020-debug-label-main.c.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0020-debug-label-main.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0020-debug-label-main.c.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,14 @@ +--- a/ldap/servers/slapd/main.c ++++ b/ldap/servers/slapd/main.c +@@ -124,6 +124,11 @@ static void cmd_set_shutdown(int); + * global variables + */ + ++#if defined(USE_MOZLDAP) && defined(LDAP_DEBUG) ++int ldap_debug = 1; ++int lber_debug = 1; ++#endif ++ + static int slapd_exemode = SLAPD_EXEMODE_UNKNOWN; + + static int init_cmd_shutdown_detect() Copied: csw/mgar/pkg/389-ds-base/trunk/files/0021-include-lber.h-slapi-plugin.h.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0021-include-lber.h-slapi-plugin.h.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0021-include-lber.h-slapi-plugin.h.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0021-include-lber.h-slapi-plugin.h.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,17 @@ +--- a/ldap/servers/slapd/slapi-plugin.h ++++ b/ldap/servers/slapd/slapi-plugin.h +@@ -7347,14 +7347,6 @@ char **slapi_str2charray_ext( char *str, char *brkstr, int allow_dups ); + #define LDAP_SASL_EXTERNAL "EXTERNAL" /* TLS/SSL extension */ + #endif + +-#ifndef LBER_SOCKET +-#ifdef LBER_SOCKET_T +-#define LBER_SOCKET LBER_SOCKET_T +-#else +-#define LBER_SOCKET int +-#endif +-#endif +- + /* Used to make unhashed passwords available to plugins. */ + #define PSEUDO_ATTR_UNHASHEDUSERPASSWORD "unhashed#user#password" + Copied: csw/mgar/pkg/389-ds-base/trunk/files/0022-adjust-mozldap-version-sasl_io.c.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0022-adjust-mozldap-version-sasl_io.c.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0022-adjust-mozldap-version-sasl_io.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0022-adjust-mozldap-version-sasl_io.c.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,11 @@ +--- a/ldap/servers/slapd/sasl_io.c ++++ b/ldap/servers/slapd/sasl_io.c +@@ -47,7 +47,7 @@ + #include + #ifndef USE_OPENLDAP + #include "mozldap.h" +-#if LDAP_VENDOR_VERSION > 604 ++#if LDAP_VENDOR_VERSION > 607 + /* garbage to cause build to fail */ + MOZLDAP is newer than expected, if the ber structure has not changed + (see ldap/server/slapd/mozldap.h), please bump the version number(604 -> new version) Copied: csw/mgar/pkg/389-ds-base/trunk/files/0023-phtread-include-slapi2nspr.c.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0023-phtread-include-slapi2nspr.c.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0023-phtread-include-slapi2nspr.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0023-phtread-include-slapi2nspr.c.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,13 @@ +--- a/ldap/servers/slapd/slapi2nspr.c ++++ b/ldap/servers/slapd/slapi2nspr.c +@@ -60,7 +60,9 @@ + * directly to their NSPR equivalents. Clever, huh? + */ + +- ++#ifdef USE_POSIX_RWLOCKS ++#include ++#endif + /* + * ---------------- SLAPI API Functions -------------------------------------- + */ Copied: csw/mgar/pkg/389-ds-base/trunk/files/0024-strndup.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0024-strndup.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0024-strndup.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0024-strndup.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,27 @@ +--- a/ldap/servers/plugins/automember/automember.c ++++ b/ldap/servers/plugins/automember/automember.c +@@ -44,7 +44,10 @@ + */ + #include "automember.h" + +- ++#include "plstr.h" ++#ifndef strndup ++#define strndup PL_strndup ++#endif + /* + * Plug-in globals + */ +--- a/ldap/servers/plugins/mep/mep.c ++++ b/ldap/servers/plugins/mep/mep.c +@@ -39,6 +39,10 @@ + # include + #endif + ++#include "plstr.h" ++#ifndef strndup ++#define strndup PL_strndup ++#endif + /* + * Managed Entries Plug-in + */ Copied: csw/mgar/pkg/389-ds-base/trunk/files/0025-posix-winsync.rawentry.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0025-posix-winsync.rawentry.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0025-posix-winsync.rawentry.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0025-posix-winsync.rawentry.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,173 @@ +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -372,23 +372,38 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */ + return; + } + +-/* Returns non-zero if the attribute value sets are identical. */ ++ + static int + attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b) + { +- int i = 0; +- Slapi_Value *va = NULL; +- +- /* Iterate through values in attr a and search for each in attr b */ +- for (i = slapi_attr_first_value(a, &va); va && (i != -1); i = slapi_attr_next_value(a, i, &va)) { +- +- /* Compare the entire attribute value */ +- if (slapi_attr_value_find(b, slapi_value_get_berval(va)) != 0) { +- return 0; ++ /* For now only handle single values */ ++ Slapi_Value *va = NULL; ++ Slapi_Value *vb = NULL; ++ int num_a = 0; ++ int num_b = 0; ++ int match = 1; ++ ++ slapi_attr_get_numvalues(a,&num_a); ++ slapi_attr_get_numvalues(b,&num_b); ++ ++ if (num_a == num_b) { ++ slapi_attr_first_value(a, &va); ++ slapi_attr_first_value(b, &vb); ++ ++ /* If either val is less than n, then check if the length, then values are ++ * equal. If both are n or greater, then only compare the first n chars. ++ * If n is 0, then just compare the entire attribute. */ ++ if (va->bv.bv_len == vb->bv.bv_len) { ++ if (slapi_attr_value_find(b, slapi_value_get_berval(va)) != 0) { ++ match = 0; ++ } ++ } else { ++ match = 0; + } +- } +- return 1; +-} ++ } else { ++ match = 0; ++ } ++ return match;} + + /* look in the parent nodes of ds_entry for nis domain entry */ + char * +@@ -777,10 +792,10 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "--> _pre_ds_mod_user_cb -- begin\n"); + +- if ((NULL == rawentry) || (NULL == ad_entry) || (NULL == ds_entry)) { ++ if ((NULL == ad_entry) || (NULL == ds_entry)) { + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "<-- _pre_ds_mod_user_cb -- Empty %s entry.\n", +- (NULL==rawentry)?"rawentry":(NULL==ad_entry)?"ad entry":"ds entry"); ++ (NULL==ad_entry)?"ad entry":"ds entry"); + return; + } + +@@ -898,7 +913,7 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + } + slapi_value_free(&voc); + } +- sync_acct_disable(cbdata, rawentry, ds_entry, ACCT_DISABLE_TO_DS, NULL, smods, do_modify); ++ sync_acct_disable(cbdata, ad_entry, ds_entry, ACCT_DISABLE_TO_DS, NULL, smods, do_modify); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "<-- _pre_ds_mod_user_cb %s %s\n", + slapi_sdn_get_dn(slapi_entry_get_sdn_const(ds_entry)), (do_modify) ? "modified" + : "not modified"); +@@ -944,14 +959,16 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + Slapi_Attr *local_attr = NULL; + char *local_type = NULL; + +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "1.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- found AD attr %s\n", type); + slapi_attr_get_valueset(attr, &vs); + local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); + slapi_entry_attr_find(ds_entry, local_type, &local_attr); + is_present_local = (NULL == local_attr) ? 0 : 1; + if (is_present_local) { + int values_equal = 0; +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "2.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- compare with DS attr %s\n", local_type); + values_equal = attr_compare_equal(attr, local_attr); + if (!values_equal) { + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +@@ -964,13 +981,13 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + *do_modify = 1; + } + } else { +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "3.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- add attr\n"); + + slapi_mods_add_mod_values(smods, LDAP_MOD_ADD, local_type, + valueset_get_valuearray(vs)); + *do_modify = do_modify_local = 1; + } +- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "4.\n"); ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- values compared\n"); + + slapi_ch_free((void**) &local_type); + slapi_valueset_free(vs); +@@ -1109,7 +1126,7 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap + } + } + } +- sync_acct_disable(cbdata, rawentry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); ++ sync_acct_disable(cbdata, ad_entry, ds_entry, ACCT_DISABLE_TO_DS, ds_entry, NULL, NULL); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "<-- _pre_ds_add_user_cb -- end\n"); + + return; +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -68,6 +68,7 @@ + #include + #include "posix-wsp-ident.h" + #include "posix-group-func.h" ++#include "slap.h" + + #define MEMBEROFTASK "memberuid task" + Slapi_Value ** +@@ -136,7 +137,7 @@ enum + * -1 - some sort of error + */ + static int +-check_account_lock(Slapi_Entry *ds_entry, int *isvirt) ++_check_account_lock(Slapi_Entry *ds_entry, int *isvirt) + { + int rc = 1; + Slapi_ValueSet *values = NULL; +@@ -155,7 +156,7 @@ check_account_lock(Slapi_Entry *ds_entry, int *isvirt) + } + slapi_ch_free_string(&strval); + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +- "<-- check_account_lock - entry [%s] has real " ++ "<-- _check_account_lock - entry [%s] has real " + "attribute nsAccountLock and entry %s locked\n", + slapi_entry_get_dn_const(ds_entry), rc ? "is not" : "is"); + return rc; +@@ -182,13 +183,13 @@ check_account_lock(Slapi_Entry *ds_entry, int *isvirt) + slapi_vattr_values_free(&values, &actual_type_name, attr_free_flags); + } + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +- "<-- check_account_lock - entry [%s] has virtual " ++ "<-- _check_account_lock - entry [%s] has virtual " + "attribute nsAccountLock and entry %s locked\n", + slapi_entry_get_dn_const(ds_entry), rc ? "is not" : "is"); + } else { + rc = 1; /* no attr == entry is enabled */ + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +- "<-- check_account_lock - entry [%s] does not " ++ "<-- _check_account_lock - entry [%s] does not " + "have attribute nsAccountLock - entry is not locked\n", + slapi_entry_get_dn_const(ds_entry)); + } +@@ -225,7 +226,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */ + int isvirt = 0; + + /* get the account lock state of the ds entry */ +- if (0 == check_account_lock(ds_entry, &isvirt)) { ++ if (0 == _check_account_lock(ds_entry, &isvirt)) { + ds_is_enabled = 0; + } + if (isvirt) Copied: csw/mgar/pkg/389-ds-base/trunk/files/0026-handle-delete-memberuid-posix-winsync.c.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0026-handle-delete-memberuid-posix-winsync.c.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0026-handle-delete-memberuid-posix-winsync.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0026-handle-delete-memberuid-posix-winsync.c.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,53 @@ +--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c +@@ -954,17 +955,19 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + + slapi_attr_get_type(attr, &type); + for (; attr_map[i].windows_attribute_name != NULL; i++) { ++ Slapi_Attr *local_attr = NULL; ++ char *local_type = NULL; ++ local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); ++ slapi_entry_attr_find(ds_entry, local_type, &local_attr); ++ is_present_local = (NULL == local_attr) ? 0 : 1; + if (0 == slapi_attr_type_cmp(type, attr_map[i].windows_attribute_name, +- SLAPI_TYPE_CMP_SUBTYPE)) { +- Slapi_Attr *local_attr = NULL; +- char *local_type = NULL; ++ SLAPI_TYPE_CMP_SUBTYPE)) ++ { ++ + + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, + "_pre_ds_mod_group_cb -- found AD attr %s\n", type); + slapi_attr_get_valueset(attr, &vs); +- local_type = slapi_ch_strdup(attr_map[i].ldap_attribute_name); +- slapi_entry_attr_find(ds_entry, local_type, &local_attr); +- is_present_local = (NULL == local_attr) ? 0 : 1; + if (is_present_local) { + int values_equal = 0; + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, +@@ -989,10 +992,21 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry, Sla + } + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "_pre_ds_mod_group_cb -- values compared\n"); + +- slapi_ch_free((void**) &local_type); + slapi_valueset_free(vs); +- /* what about if delete all values on windows ???? */ +- } ++ } else { ++ /* what about if delete all values on windows ? -> delete*/ ++ if (is_present_local) { ++ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, ++ "_pre_ds_mod_group_cb -- update mods: %s, %s : values deleted -> modify\n", ++ slapi_sdn_get_dn(slapi_entry_get_sdn_const(ds_entry)), ++ local_type); ++ ++ ++ slapi_mods_add_mod_values(smods, LDAP_MOD_DELETE, local_type, NULL); ++ *do_modify = 1; ++ } ++ } ++ slapi_ch_free((void**) &local_type); + } + } + slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, Copied: csw/mgar/pkg/389-ds-base/trunk/files/0027-Slapi-rwlock-size.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0027-Slapi-rwlock-size.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0027-Slapi-rwlock-size.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0027-Slapi-rwlock-size.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,32 @@ +--- a/ldap/servers/slapd/entry.c ++++ b/ldap/servers/slapd/entry.c +@@ -2064,7 +2064,7 @@ slapi_entry_size(Slapi_Entry *e) + if (e->e_uniqueid) size += strlen(e->e_uniqueid) + 1; + if (e->e_dncsnset) size += csnset_size(e->e_dncsnset); + if (e->e_maxcsn) size += sizeof( CSN ); +- if (e->e_virtual_lock) size += sizeof(Slapi_RWLock); ++ if (e->e_virtual_lock) size += sizeof(Slapi_RWLock_size); + /* Slapi_DN and RDN are included in Slapi_Entry */ + size += (slapi_sdn_get_size(&e->e_sdn) - sizeof(Slapi_DN)); + size += (slapi_rdn_get_size(&e->e_srdn) - sizeof(Slapi_RDN)); +--- a/ldap/servers/slapd/pw.c ++++ b/ldap/servers/slapd/pw.c +@@ -2728,7 +2728,7 @@ pw_get_ext_size(Slapi_Entry *entry, size_t *size) + return LDAP_SUCCESS; + } + *size += sizeof(struct slapi_pw_entry_ext); +- *size += sizeof(Slapi_RWLock); ++ *size += sizeof(Slapi_RWLock_size); + if (LDAP_SUCCESS == slapi_pw_get_entry_ext(entry, &pw_entry_values)) { + Slapi_Value *cvalue; + int idx = valuearray_first_value(pw_entry_values, &cvalue); +--- a/ldap/servers/slapd/slapi-plugin.h ++++ b/ldap/servers/slapd/slapi-plugin.h +@@ -6000,6 +6000,7 @@ typedef struct slapi_condvar Slapi_CondVar; + typedef pthread_rwlock_t Slapi_RWLock; + #else + typedef struct slapi_rwlock Slapi_RWLock; ++#define Slapi_RWLock_size (5*sizeof(void*)+(4*sizeof(PRUint32))) + #endif + Slapi_Mutex *slapi_new_mutex( void ); + void slapi_destroy_mutex( Slapi_Mutex *mutex ); Copied: csw/mgar/pkg/389-ds-base/trunk/files/0030-reconstruct-memberuid-generation-task.patch (from rev 23393, csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0030-reconstruct-memberuid-generation-task.patch) =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0030-reconstruct-memberuid-generation-task.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0030-reconstruct-memberuid-generation-task.patch 2014-04-11 08:57:11 UTC (rev 23394) @@ -0,0 +1,375 @@ +From 4e356cca64387b814a5ae08f1bf246132372370b Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 8 Apr 2014 15:30:21 +0200 +Subject: [PATCH] reconstruct memberuid generation task + +--- + .../plugins/posix-winsync/posix-group-task.c | 144 +++++++++++++++++---- + .../plugins/posix-winsync/posix-winsync-config.c | 2 +- + .../plugins/posix-winsync/posix-wsp-ident.h | 2 +- + 3 files changed, 119 insertions(+), 29 deletions(-) + +diff --git a/ldap/servers/plugins/posix-winsync/posix-group-task.c b/ldap/servers/plugins/posix-winsync/posix-group-task.c +index 9f558bf..d038f08 100644 +--- a/ldap/servers/plugins/posix-winsync/posix-group-task.c ++++ b/ldap/servers/plugins/posix-winsync/posix-group-task.c +@@ -31,7 +31,7 @@ valueset_get_valuearray(const Slapi_ValueSet *vs); /* stolen from proto-slap.h * + + /* interface function */ + int +-posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, ++posix_group_memberuid_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, + char *returntext, void *arg); + + Slapi_Entry * +@@ -62,7 +62,7 @@ fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val) + + /* e configEntry */ + int +-posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, ++posix_group_memberuid_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, + char *returntext, void *arg) + { + PRThread *thread = NULL; +@@ -76,7 +76,7 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: ==>\n"); ++ "posix_group_memberuid_task_add: ==>\n"); + + /* get arg(s) */ + /* default: set replication basedn */ +@@ -87,16 +87,16 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: retrieved basedn: %s\n", dn); ++ "posix_group_memberuid_task_add: retrieved basedn: %s\n", dn); + +- if ((filter = fetch_attr(e, "filter", "(objectclass=ntGroup)")) == NULL) { ++ if ((filter = fetch_attr(e, "filter", "(&(objectclass=posixGroup)(uniquemember=*))")) == NULL) { + *returncode = LDAP_OBJECT_CLASS_VIOLATION; + rv = SLAPI_DSE_CALLBACK_ERROR; + goto out; + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: retrieved filter: %s\n", filter); ++ "posix_group_memberuid_task_add: retrieved filter: %s\n", filter); + + /* setup our task data */ + mytaskdata = (task_data*) slapi_ch_malloc(sizeof(task_data)); +@@ -109,31 +109,31 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + mytaskdata->filter_str = slapi_ch_strdup(filter); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task data allocated\n"); ++ "posix_group_memberuid_task_add: task data allocated\n"); + + /* allocate new task now */ + char * ndn = slapi_entry_get_ndn(e); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: creating task object: %s\n", ++ "posix_group_memberuid_task_add: creating task object: %s\n", + ndn); + + task = slapi_new_task(ndn); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task object created\n"); ++ "posix_group_memberuid_task_add: task object created\n"); + + /* register our destructor for cleaning up our private data */ + slapi_task_set_destructor_fn(task, posix_group_task_destructor); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task destructor set\n"); ++ "posix_group_memberuid_task_add: task destructor set\n"); + + /* Stash a pointer to our data in the task */ + slapi_task_set_data(task, mytaskdata); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: task object initialized\n"); ++ "posix_group_memberuid_task_add: task object initialized\n"); + + /* start the sample task as a separate thread */ + thread = PR_CreateThread(PR_USER_THREAD, posix_group_fixup_task_thread, (void *) task, +@@ -141,7 +141,7 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + SLAPD_DEFAULT_THREAD_STACKSIZE); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: thread created\n"); ++ "posix_group_memberuid_task_add: thread created\n"); + + if (thread == NULL) { + slapi_log_error(SLAPI_LOG_FATAL, POSIX_WINSYNC_PLUGIN_NAME, +@@ -155,7 +155,7 @@ posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int + + out: + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "posix_group_task_add: <==\n"); ++ "posix_group_memberuid_task_add: <==\n"); + + return rv; + } +@@ -174,7 +174,6 @@ posix_group_task_destructor(Slapi_Task *task) + } + } + +-#if 0 /* NOT USED */ + static int + posix_group_del_memberuid_callback(Slapi_Entry *e, void *callback_data) + { +@@ -209,7 +208,6 @@ posix_group_del_memberuid_callback(Slapi_Entry *e, void *callback_data) + + return rc; + } +-#endif + + static int + posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) +@@ -220,6 +218,9 @@ posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) + + /* char *attrs[]={"uniquemember","memberuid",NULL}; */ + ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, ++ "_fix_memberuid, filter: %s==>\n", filter_str ); ++ + slapi_search_internal_set_pb(search_pb, dn, LDAP_SCOPE_SUBTREE, filter_str, 0, 0, 0, 0, + posix_winsync_get_plugin_identity(), 0); + +@@ -229,6 +230,8 @@ posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) + + slapi_pblock_destroy(search_pb); + ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, ++ "_fix_memberuid for entry: <== rc=%d\n", rc ); + return rc; + } + +@@ -238,10 +241,12 @@ posix_group_fix_memberuid(char *dn, char *filter_str, void *txn) + * 1. forall uniquemember search if posixAccount ? add uid : "" + */ + static int +-posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) ++posix_group_fix_memberuid_cb(Slapi_Entry *e, void *callback_data) + { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid ==>\n"); ++ "_fix_memberuid_cb for entry: %s==>\n", ++ slapi_entry_get_dn_const(e)); ++ + cb_data *the_cb_data = (cb_data *) callback_data; + + int rc; +@@ -270,7 +275,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid scan for orphaned memberuids\n"); ++ "_fix_memberuid_cb scan for orphaned memberuids\n"); + + int i; + for (i = slapi_attr_first_value(muid_attr, &v); i != -1; +@@ -278,7 +283,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + char *muid = (char *)slapi_value_get_string(v); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid iterating memberuid: %s\n", ++ "_fix_memberuid_cb iterating memberuid: %s\n", + muid); + + size_t vallen = muid ? strlen(muid) : 0; +@@ -296,7 +301,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + posix_winsync_get_plugin_identity(), 0); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid searching %s with filter: %s\n", ++ "_fix_memberuid_cb searching %s with filter: %s\n", + the_cb_data->dn, filter); + + rc = slapi_search_internal_pb(search_pb); +@@ -305,14 +310,14 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + + if (!search_entries || !search_entries[0]) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid Adding bad memberuid %s\n", ++ "_fix_memberuid_cb deleting bad memberuid %s\n", + slapi_value_get_string(v)); + + slapi_mods_add_string(smods, LDAP_MOD_DELETE, "memberuid", slapi_value_get_string(v)); + + if (dsmuid_vs && slapi_valueset_find(dsmuid_attr, dsmuid_vs, v)) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid Adding bad dsonlymemberuid %s\n", ++ "_fix_memberuid_cb delete bad dsonlymemberuid %s\n", + slapi_value_get_string(v)); + + slapi_mods_add_string(smods, LDAP_MOD_DELETE, "dsonlymemberuid", slapi_value_get_string(v)); +@@ -342,7 +347,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + Slapi_Value * uniqval = NULL; /* uniquemeber Attribute values */ + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid scan uniquemember, group %s\n", dn); ++ "_fix_memberuid_cb scan uniquemember, group %s\n", dn); + for (i = slapi_attr_first_value(obj_attr, &uniqval); i != -1; + i = slapi_attr_next_value(obj_attr, i, &uniqval)) { + +@@ -352,7 +357,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + + if (!child) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid orphaned uniquemember found: %s\n", member); ++ "_fix_memberuid_cb orphaned uniquemember found: %s\n", member); + + if (strncasecmp(member, "cn=", 3) == 0) { + fixMembership = 1; +@@ -365,13 +370,13 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + } + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid Finishing...\n"); ++ "_fix_memberuid_cb Finishing...\n"); + + if (fixMembership && posix_winsync_config_get_mapNestedGrouping()) { + Slapi_ValueSet *del_nested_vs = slapi_valueset_new(); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid group deleted, recalculating nesting\n"); ++ "_fix_memberuid_cb group deleted, recalculating nesting\n"); + propogateDeletionsUpward(e, sdn, bad_ums, del_nested_vs, 0); + + slapi_valueset_free(del_nested_vs); del_nested_vs = NULL; +@@ -386,6 +391,8 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + mods = slapi_mods_get_ldapmods_passout(smods); + if (mods) { + Slapi_PBlock *mod_pb = NULL; ++ if (slapi_is_loglevel_set(SLAPI_LOG_PLUGIN)) ++ slapi_mods_dump(smods, "fix_memberuid_cb - mods dump - change memberuids"); + mod_pb = slapi_pblock_new(); + slapi_modify_internal_set_pb_ext(mod_pb, sdn, mods, 0, 0, + posix_winsync_get_plugin_identity(), 0); +@@ -399,7 +406,90 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) + slapi_mods_free(&smods); + + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, +- "_fix_memberuid <==\n"); ++ "_fix_memberuid_cb <==\n"); ++ return rc; ++} ++ ++static int ++posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data) ++{ ++ int rc = 0; ++ char *dn = slapi_entry_get_dn(e); ++ Slapi_DN *sdn = slapi_entry_get_sdn(e); ++ ++ Slapi_Attr *obj_attr = NULL; ++ ++ rc = slapi_entry_attr_find(e, "uniquemember", &obj_attr); ++ if (rc == 0) { /* Found uniquemember, so... */ ++ int i; ++ Slapi_Value * value = slapi_value_new(); /* new memberuid Attribute values */ ++ Slapi_Value * uniqval = NULL; /* uniquemeber Attribute values */ ++ Slapi_ValueSet *uids = slapi_valueset_new(); ++ ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, ++ "_fix_memberuid scan uniquemember, group %s\n", dn); ++ for (i = slapi_attr_first_value(obj_attr, &uniqval); i != -1; ++ i = slapi_attr_next_value(obj_attr, i, &uniqval)) { ++ const char *member = NULL; ++ char * uid = NULL; ++ member = slapi_value_get_string(uniqval); ++ /* search uid for member (DN) */ ++ slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, "search %s\n", member); ++ if ((uid = searchUid(member)) != NULL) { ++ slapi_value_set_string(value, uid); ++ /* add uids ValueSet */ ++ slapi_valueset_add_value(uids, value); ++ } ++ } ++ slapi_value_free(&value); ++ ++ /* If we found some posix members, replace the existing memberuid attribute ++ * with the found values. */ ++ if (uids && slapi_valueset_count(uids)) { ++ Slapi_PBlock *mod_pb = slapi_pblock_new(); ++ Slapi_Value *val = 0; ++ Slapi_Mod *smod; ++ LDAPMod **mods = (LDAPMod **) slapi_ch_malloc(2 * sizeof(LDAPMod *)); ++ int hint = 0; ++ cb_data *the_cb_data = (cb_data *) callback_data; ++ ++ smod = slapi_mod_new(); ++ slapi_mod_init(smod, 0); ++ slapi_mod_set_operation(smod, LDAP_MOD_REPLACE | LDAP_MOD_BVALUES); ++ slapi_mod_set_type(smod, "memberuid"); ++ ++ /* Loop through all of our values and add them to smod */ ++ hint = slapi_valueset_first_value(uids, &val); ++ while (val) { ++ /* this makes a copy of the berval */ ++ slapi_mod_add_value(smod, slapi_value_get_berval(val)); ++ hint = slapi_valueset_next_value(uids, hint, &val); ++ } ++ ++ mods[0] = slapi_mod_get_ldapmod_passout(smod); ++ mods[1] = 0; ++ ++ if (slapi_is_loglevel_set(SLAPI_LOG_PLUGIN)) ++ slapi_mods_dump(mods, "_fix_memberuid_callback - mods dump - change memberuids"); ++ ++ slapi_modify_internal_set_pb_ext(mod_pb, sdn, mods, 0, 0, ++ posix_winsync_get_plugin_identity(), 0); ++ ++ slapi_pblock_set(mod_pb, SLAPI_TXN, the_cb_data->txn); ++ slapi_modify_internal_pb(mod_pb); ++ ++ slapi_pblock_get(mod_pb, SLAPI_PLUGIN_INTOP_RESULT, &rc); ++ ++ ldap_mods_free(mods, 1); ++ slapi_mod_free(&smod); ++ slapi_pblock_destroy(mod_pb); ++ } else { ++ /* No member were found, so remove the memberuid attribute ++ * from this entry. */ ++ posix_group_del_memberuid_callback(e, callback_data); ++ } ++ slapi_valueset_free(uids); ++ } + return rc; + } + +diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync-config.c b/ldap/servers/plugins/posix-winsync/posix-winsync-config.c +index a7fd6e9..4098ee2 100644 +--- a/ldap/servers/plugins/posix-winsync/posix-winsync-config.c ++++ b/ldap/servers/plugins/posix-winsync/posix-winsync-config.c +@@ -205,7 +205,7 @@ posix_winsync_config(Slapi_Entry *config_e) + LDAP_SCOPE_BASE, POSIX_WINSYNC_CONFIG_FILTER, + posix_winsync_apply_config, NULL); + +- rc = slapi_task_register_handler("memberuid task", posix_group_task_add); ++ rc = slapi_task_register_handler("memberuid task", posix_group_memberuid_task_add); + if (rc) { + slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME, + "posix_winsync_config -- register memberuid task failed\n"); +diff --git a/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h b/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h +index f36fe40..88f6a9f 100644 +--- a/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h ++++ b/ldap/servers/plugins/posix-winsync/posix-wsp-ident.h +@@ -45,7 +45,7 @@ void posix_winsync_config_set_MOFTaskCreated(); + PRBool posix_winsync_config_get_MOFTaskCreated(); + PRBool posix_winsync_config_get_mapNestedGrouping(); + +-int posix_group_task_add(Slapi_PBlock *pb, Slapi_Entry *e, ++int posix_group_memberuid_task_add(Slapi_PBlock *pb, Slapi_Entry *e, + Slapi_Entry *eAfter, int *returncode, char *returntext, + void *arg); + +-- +1.8.4.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 Fri Apr 11 12:12:35 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Apr 2014 10:12:35 +0000 Subject: SF.net SVN: gar:[23395] csw/mgar/pkg/util-linux/trunk Message-ID: <3g4w5S2hxBz126@mail.opencsw.org> Revision: 23395 http://sourceforge.net/p/gar/code/23395 Author: wahwah Date: 2014-04-11 10:12:34 +0000 (Fri, 11 Apr 2014) Log Message: ----------- util-linux/trunk: It does not build Modified Paths: -------------- csw/mgar/pkg/util-linux/trunk/Makefile csw/mgar/pkg/util-linux/trunk/checksums Modified: csw/mgar/pkg/util-linux/trunk/Makefile =================================================================== --- csw/mgar/pkg/util-linux/trunk/Makefile 2014-04-11 08:57:11 UTC (rev 23394) +++ csw/mgar/pkg/util-linux/trunk/Makefile 2014-04-11 10:12:34 UTC (rev 23395) @@ -1,11 +1,14 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) -# +# +# Programs to build from this source: +# - watch +# - column NAME = util-linux -VERSION = 2.21 -PATCHLEVEL = .2 +MINOR_VER = 2.24 +PATCHLEVEL = .1 +VERSION = $(MINOR_VER)$(PATCHLEVEL) GARTYPE = v2 -DISTNAME = $(NAME)-$(VERSION)$(PATCHLEVEL) DESCRIPTION = A collection of basic utilities define BLURB @@ -15,10 +18,13 @@ program. endef -MASTER_SITES = http://www.kernel.org/pub/linux/utils/$(NAME)/v$(VERSION)/ -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = https://www.kernel.org/pub/linux/utils/$(NAME)/v$(MINOR_VER)/ +DISTFILES = $(DISTNAME).tar.xz +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk - Modified: csw/mgar/pkg/util-linux/trunk/checksums =================================================================== --- csw/mgar/pkg/util-linux/trunk/checksums 2014-04-11 08:57:11 UTC (rev 23394) +++ csw/mgar/pkg/util-linux/trunk/checksums 2014-04-11 10:12:34 UTC (rev 23395) @@ -1 +1 @@ -b228170ecdfce9ced77313d57b21b37c util-linux-2.21.2.tar.gz +88d46ae23ca599ac5af9cf96b531590f util-linux-2.24.1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 10:37:21 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 08:37:21 +0000 Subject: SF.net SVN: gar:[23396] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: <3g5TxD3Fwfz1Db@mail.opencsw.org> Revision: 23396 http://sourceforge.net/p/gar/code/23396 Author: guengel Date: 2014-04-12 08:37:21 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Bumped to new upstream release 8.4.21. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2014-04-11 10:12:34 UTC (rev 23395) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2014-04-12 08:37:21 UTC (rev 23396) @@ -90,7 +90,7 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 20 +PATCHLEVEL = 21 VERSION = $(BASE_VERSION).$(PATCHLEVEL) PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2014-04-11 10:12:34 UTC (rev 23395) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2014-04-12 08:37:21 UTC (rev 23396) @@ -1 +1 @@ -93d03f7fa206420aa5c87e48ec67fcdb postgresql-8.4.20.tar.bz2 +68d4658358e0a43c440e124cb0518df9 postgresql-8.4.21.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2014-04-11 10:12:34 UTC (rev 23395) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2014-04-12 08:37:21 UTC (rev 23396) @@ -1,3 +1,10 @@ +postgresql84 (8.4.21,REV=2014.04.12) + + * New upstream release 8.4.21. + + -- Rafael Ostertag Sat, 12 Apr 2014 10:35:37 +0100 + + postgresql84 (8.4.20,REV=2014.03.18) * Respin due to broken import into OpenCSW catalog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 10:54:46 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 08:54:46 +0000 Subject: SF.net SVN: gar:[23397] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: <3g5VKB4s0yz1JS@mail.opencsw.org> Revision: 23397 http://sourceforge.net/p/gar/code/23397 Author: guengel Date: 2014-04-12 08:54:45 +0000 (Sat, 12 Apr 2014) Log Message: ----------- New upstream release 9.0.17. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2014-04-12 08:37:21 UTC (rev 23396) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2014-04-12 08:54:45 UTC (rev 23397) @@ -90,7 +90,7 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 16 +PATCHLEVEL = 17 VERSION = $(BASE_VERSION).$(PATCHLEVEL) PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2014-04-12 08:37:21 UTC (rev 23396) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2014-04-12 08:54:45 UTC (rev 23397) @@ -1 +1 @@ -eec9c581a13dc38d9a050f0e06f1ebe5 postgresql-9.0.16.tar.bz2 +46bf3ef3761c091fb0d2e25012c1709e postgresql-9.0.17.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2014-04-12 08:37:21 UTC (rev 23396) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2014-04-12 08:54:45 UTC (rev 23397) @@ -1,3 +1,10 @@ +postgresql90 (9.0.17,REV=2014.04.12) + + * New upstream release 9.0.17. + + -- Rafael Ostertag Sat, 12 Aprt 2014 10:52:53 +0200 + + postgresql90 (9.0.16,REV=2014.03.16) * New upstream release 9.0.16. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 11:00:23 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 09:00:23 +0000 Subject: SF.net SVN: gar:[23398] csw/mgar/pkg/postgresql/branches/postgresql-9.1 Message-ID: <3g5VRg4cQHz1Mj@mail.opencsw.org> Revision: 23398 http://sourceforge.net/p/gar/code/23398 Author: guengel Date: 2014-04-12 09:00:21 +0000 (Sat, 12 Apr 2014) Log Message: ----------- New upstream release 9.1.13. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2014-04-12 08:54:45 UTC (rev 23397) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2014-04-12 09:00:21 UTC (rev 23398) @@ -90,7 +90,7 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 12 +PATCHLEVEL = 13 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2014-04-12 08:54:45 UTC (rev 23397) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2014-04-12 09:00:21 UTC (rev 23398) @@ -1 +1 @@ -a14eb8a602af44f1827a9ecf928e7b44 postgresql-9.1.12.tar.bz2 +f50e201b4ef7e0581bf32a1a32c9f14c postgresql-9.1.13.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2014-04-12 08:54:45 UTC (rev 23397) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2014-04-12 09:00:21 UTC (rev 23398) @@ -1,3 +1,10 @@ +postgresql91 (9.1.13,REV=2014.04.12) + + * New upstream release 9.1.13. + + -- Rafael Ostertag Sat, 12 Apr 2014 10:59:33 +0200 + + postgresql91 (9.1.12,REV=2014.03.16) * New upstream release 9.1.12. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 11:04:52 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 09:04:52 +0000 Subject: SF.net SVN: gar:[23399] csw/mgar/pkg/postgresql/branches/postgresql-9.2 Message-ID: <3g5VXs1JCRz1R1@mail.opencsw.org> Revision: 23399 http://sourceforge.net/p/gar/code/23399 Author: guengel Date: 2014-04-12 09:04:51 +0000 (Sat, 12 Apr 2014) Log Message: ----------- New upstream release 9.2.8. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile 2014-04-12 09:00:21 UTC (rev 23398) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile 2014-04-12 09:04:51 UTC (rev 23399) @@ -90,7 +90,7 @@ BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 7 +PATCHLEVEL = 8 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums 2014-04-12 09:00:21 UTC (rev 23398) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums 2014-04-12 09:04:51 UTC (rev 23399) @@ -1 +1 @@ -610354e939d3b6d8d1a620504bc25fb2 postgresql-9.2.7.tar.bz2 +c5c65a9b45ee53ead0b659be21ca1b97 postgresql-9.2.8.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW 2014-04-12 09:00:21 UTC (rev 23398) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW 2014-04-12 09:04:51 UTC (rev 23399) @@ -1,3 +1,10 @@ +postgresql92 (9.2.8,REV=2014.04.12) + + * New upstream release 9.2.8. + + -- Rafael Ostertag Sat, 12 Apr 2014 11:02:13 +0200 + + postgresql92 (9.2.7,REV=2014.03.16) * New upstream release 9.2.7. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Apr 12 11:39:43 2014 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 12 Apr 2014 10:39:43 +0100 Subject: SF.net SVN: gar:[23399] csw/mgar/pkg/postgresql/branches/postgresql-9.2 In-Reply-To: <3g5VXs1JCRz1R1@mail.opencsw.org> References: <3g5VXs1JCRz1R1@mail.opencsw.org> Message-ID: Rafael, could you use "mgar ci" instead of "svn ci"? -------------- next part -------------- An HTML attachment was scrubbed... URL: From guengel at users.sourceforge.net Sat Apr 12 20:37:02 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 18:37:02 +0000 Subject: SF.net SVN: gar:[23400] csw/mgar/pkg/postgresql/trunk Message-ID: <3g5lFB20ZczNG@mail.opencsw.org> Revision: 23400 http://sourceforge.net/p/gar/code/23400 Author: guengel Date: 2014-04-12 18:36:59 +0000 (Sat, 12 Apr 2014) Log Message: ----------- postgresql/trunk: New upstream release. 32/64bit specific header wrapped. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h csw/mgar/pkg/postgresql/trunk/files/pg_config.h csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2014-04-12 09:04:51 UTC (rev 23399) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2014-04-12 18:36:59 UTC (rev 23400) @@ -85,12 +85,24 @@ # Further, it does not use alternatives and puts binaries in $(bindir) # (see 'post-merge-modulated:'). This will make it easier for # maintainers to use `pg_config'. +# +# The following headers are architecture dependend: +# +# $(includedir)/pg_config.h +# $(includedir)/pg_config_ext.h +# $(includedir)/ecpg_config.h +# $(includedir)/postgresql/server/pg_config.h +# $(includedir)/postgresql/server/pg_config_ext.h +# +# therefore, they will be renamed to _32.h, or _64.h repectively, and +# a wrapper header file will be placed which includes the proper +# header file upon compile time. NAME = postgresql BASE_VERSION = 9.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 3 +PATCHLEVEL = 4 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 GARCOMPILER = SOS12U3 @@ -262,6 +274,9 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += README.CSW DISTFILES += changelog.CSW +DISTFILES += pg_config.h +DISTFILES += pg_config_ext.h +DISTFILES += ecpg_config.h DISTFILES += $(SERVERPOSTINSTTMPL) DISTFILES += $(INITSCRIPTFILETMPL) DISTFILES += $(USERGROUPFILETMPL) @@ -577,6 +592,13 @@ @echo " ===> Installing contrib stuff" $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install $(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs +# Move headers depending on the memory model aside. +# In post-merge, a wrapper header file will be dropped in their place including the proper header dynamically. + gmv $(DESTDIR)$(includedir)/pg_config.h $(DESTDIR)$(includedir)/pg_config_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/pg_config_ext.h $(DESTDIR)$(includedir)/pg_config_ext_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/ecpg_config.h $(DESTDIR)$(includedir)/ecpg_config_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/postgresql/server/pg_config.h $(DESTDIR)$(includedir)/postgresql/server/pg_config_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/postgresql/server/pg_config_ext.h $(DESTDIR)$(includedir)/postgresql/server/pg_config_ext_$(MEMORYMODEL).h @$(MAKECOOKIE) # We suck in the libpgport.a since pg_config is emitting @@ -593,6 +615,13 @@ for f in $(BIN_NAMES_DEVEL) ; do \ gmv -v $(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/ ; \ done +# here, we pull in the header architecture dependend header files + gmv $(DESTDIR)$(includedir)/pg_config_$(MEMORYMODEL).h $(PKGROOT)$(includedir)/pg_config_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/pg_config_ext_$(MEMORYMODEL).h $(PKGROOT)$(includedir)/pg_config_ext_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/ecpg_config_$(MEMORYMODEL).h $(PKGROOT)$(includedir)/ecpg_config_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/postgresql/server/pg_config_$(MEMORYMODEL).h $(PKGROOT)$(includedir)/postgresql/server/pg_config_$(MEMORYMODEL).h + gmv $(DESTDIR)$(includedir)/postgresql/server/pg_config_ext_$(MEMORYMODEL).h $(PKGROOT)$(includedir)/postgresql/server/pg_config_ext_$(MEMORYMODEL).h + @$(MAKECOOKIE) post-merge: $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation # Create my alternatives files. @@ -600,6 +629,17 @@ # Create the PGDATA directory @echo " ===> Create pgdata directory" @ginstall -d $(PKGROOT)$(PGDATA) +# Install the omnipotent pg_config.h + @echo " ===> Install omnipotent pg_config.h" + @ginstall $(FILEDIR)/pg_config.h $(PKGROOT)$(includedir) + @echo " ===> Install omnipotent pg_config_ext.h" + @ginstall $(FILEDIR)/pg_config_ext.h $(PKGROOT)$(includedir) + @echo " ===> Install omnipotent postgresql/server/pg_config.h" + @ginstall $(FILEDIR)/pg_config.h $(PKGROOT)$(includedir)/postgresql/server + @echo " ===> Install omnipotent postgresql/server/pg_config_ext.h" + @ginstall $(FILEDIR)/pg_config_ext.h $(PKGROOT)$(includedir)/postgresql/server + @echo " ===> Install omnipotent ecpg_config.h" + @ginstall $(FILEDIR)/ecpg_config.h $(PKGROOT)$(includedir) # Adjust the man page names. @echo " ===> Adjusting man page file names" @for i in 1 5 ; do \ Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2014-04-12 09:04:51 UTC (rev 23399) +++ csw/mgar/pkg/postgresql/trunk/checksums 2014-04-12 18:36:59 UTC (rev 23400) @@ -1 +1 @@ -0247b0a24e76a3f20cc50c06d0aa2412 postgresql-9.3.3.tar.bz2 +d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2 Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2014-04-12 09:04:51 UTC (rev 23399) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2014-04-12 18:36:59 UTC (rev 23400) @@ -1,3 +1,15 @@ +postgresql93 (9.3.4,REV=2014.04.12) + + * New upstream release 9.3.4. + + * /opt/csw/include/pg_config.h, /opt/csw/include/pg_config_ext.h, + /opt/csw/include/ecpg_config.h, /opt/csw/include/postgresql/server/pg_config.h, + /opt/csw/include/postgresql/server/pg_config_ext.h: are moved to _32.h, + and _64.h respectively, and a wrapper .h is put in place. + + -- Rafael Ostertag Sat, 12 Apr 2014 20:28:05 +0200 + + postgresql93 (9.3.3,REV=2014.03.16) * New upstream release 9.3.3. @@ -14,7 +26,7 @@ postgresql93 (9.3.1,REV=2013.10.22) - * New upstream release 9.3.1. + * New upstream release 9.3.1. -- Rafael Ostertag Tue, 22 Oct 2013 19:16:40 +0200 @@ -28,4 +40,3 @@ * /etc/opt/csw/postgresql-93.conf has new configuration option `DATACHECKSUMS'. -- Rafael Ostertag Sun, 06 Oct 2013 11:54:20 +0200 - Added: csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h 2014-04-12 18:36:59 UTC (rev 23400) @@ -0,0 +1,20 @@ +/* + * ecpg_config.h for 32bit is distinct from ecpg_config.h for 64bit + * architectures. In order to take this into account, this wrapper + * includes the proper ecpg_config.h depending on the architecture. + * + * This header is not part of the regular postgresql headers. It has + * been introduced due to the way things are handled in OpenCSW + * Postgresql. + * + * It is required that this header works with Sun Studio compilers as + * well as GNU GCC compilers. + * + * $Id$ + */ + +#if defined(__amd64) || defined(__sparcv9) +# include +#else +# include +#endif Property changes on: csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: csw/mgar/pkg/postgresql/trunk/files/pg_config.h =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/pg_config.h (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/pg_config.h 2014-04-12 18:36:59 UTC (rev 23400) @@ -0,0 +1,20 @@ +/* + * pg_config.h for 32bit is distinct from pg_config.h for 64bit + * architectures. In order to take this into account, this wrapper + * includes the proper pg_config.h depending on the architecture. + * + * This header is not part of the regular postgresql headers. It has + * been introduced due to the way things are handled in OpenCSW + * Postgresql. + * + * It is required that this header works with Sun Studio compilers as + * well as GNU GCC compilers. + * + * $Id$ + */ + +#if defined(__amd64) || defined(__sparcv9) +# include +#else +# include +#endif Property changes on: csw/mgar/pkg/postgresql/trunk/files/pg_config.h ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h 2014-04-12 18:36:59 UTC (rev 23400) @@ -0,0 +1,20 @@ +/* + * pg_config_ext.h for 32bit is distinct from pg_config_ext.h for 64bit + * architectures. In order to take this into account, this wrapper + * includes the proper pg_config_ext.h depending on the architecture. + * + * This header is not part of the regular postgresql headers. It has + * been introduced due to the way things are handled in OpenCSW + * Postgresql. + * + * It is required that this header works with Sun Studio compilers as + * well as GNU GCC compilers. + * + * $Id$ + */ + +#if defined(__amd64) || defined(__sparcv9) +# include +#else +# include +#endif Property changes on: csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 20:43:26 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 18:43:26 +0000 Subject: SF.net SVN: gar:[23401] csw/mgar/pkg/geos/trunk Message-ID: <3g5lNV5RNKzRk@mail.opencsw.org> Revision: 23401 http://sourceforge.net/p/gar/code/23401 Author: guengel Date: 2014-04-12 18:43:24 +0000 (Sat, 12 Apr 2014) Log Message: ----------- geos/trunk: Bumped version to 3.4.2. Enabled 64bit build. Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile csw/mgar/pkg/geos/trunk/checksums Added Paths: ----------- csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch Removed Paths: ------------- csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2014-04-12 18:36:59 UTC (rev 23400) +++ csw/mgar/pkg/geos/trunk/Makefile 2014-04-12 18:43:24 UTC (rev 23401) @@ -1,6 +1,6 @@ # $Id$ NAME = geos -VERSION = 3.3.3 +VERSION = 3.4.2 GARTYPE = v2 DESCRIPTION = Geometry Engine, Open Source @@ -12,37 +12,26 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES += 0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch -PATCHFILES += 0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch GARCOMPILER = GNU -PACKAGES = CSWlibgeos3-3-3 +PATCHFILES += 0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch + +PACKAGES = CSWlibgeos3-4-2 PACKAGES += CSWlibgeos-c1 PACKAGES += CSWgeos-dev -PACKAGES += CSWrb18-geos3-3-3 -SPKG_DESC_CSWrb18-geos3-3-3 += $(DESCRIPTION), ruby 1.8 bindings -RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 = CSWruby18 -RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos-c1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos3-3-3 -PKGFILES_CSWrb18-geos3-3-3 += .*ruby.* -CHECKPKG_OVERRIDES_CSWrb18-geos3-3-3 += surplus-dependency|CSWruby18 +SPKG_DESC_CSWlibgeos3-4-2 += $(DESCRIPTION), libgeos-3.4.2.so +PKGFILES_CSWlibgeos3-4-2 += $(call baseisadirs,$(libdir),libgeos-3\.4\.2\.so) +PKGFILES_CSWlibgeos3-4-2 += $(call baseisadirs,$(libdir),libgeos-3\.4\.2\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgeos3-4-2 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgeos3-4-2 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibgeos3-4-2 = CSWgeos -SPKG_DESC_CSWlibgeos3-3-3 += $(DESCRIPTION), libgeos-3.2.2.so -PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so) -PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibgeos3-3-3 = CSWgeos - SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 -PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) +PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.8\.2) PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-3-3 +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-4-2 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos @@ -57,14 +46,37 @@ PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE) PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE) PKGFILES_CSWgeos-dev += .*libgeos.so .*libgeos_c.so -RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-3-3 CSWlibgeos-c1 +RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-4-2 CSWlibgeos-c1 OBSOLETED_BY_CSWlibgeos-dev = CSWgeos -# c++ libraries, so move things around a bit -libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) +BUILD64 = 1 +## +## Ruby did not work (no errors, but was not built) +## Because I want to finish PostGIS, I continue w/o ruby +## + +CONFIGURE_ARGS_32 = --enable-ruby +# When compiling on AMD64 with -m64 following error is raised +# +# /opt/csw/include/ruby-1.9.1/ruby/st.h:67:93: error: size of array 'st_check_for_sizeof_st_index_t' is negative +# typedef char st_check_for_sizeof_st_index_t[SIZEOF_VOIDP == (int)sizeof(st_index_t) ? 1 : -1]; +# +# So, I'm lazzy and disable ruby on 64bit archs +CONFIGURE_ARGS_64 = --disable-ruby + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-inline -CONFIGURE_ARGS += --enable-ruby +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORY_MODEL)) +# -B direct breaks code amd64 +LINKER_DIRECT = + include gar/category.mk + +# The config process decides that the ruby library is called libruby*. That's +# fine, however, it uses -llibruby*as argument to the compiler/linker. That's +# bad. So fix it. +post-configure: + gsed -i -E -e 's/^(RUBY_SO_NAME[ ]+=[ ]+)lib(ruby[0-9.]*)\.so.*/\1\2/' $(WORKSRC)/swig/ruby/Makefile Modified: csw/mgar/pkg/geos/trunk/checksums =================================================================== --- csw/mgar/pkg/geos/trunk/checksums 2014-04-12 18:36:59 UTC (rev 23400) +++ csw/mgar/pkg/geos/trunk/checksums 2014-04-12 18:43:24 UTC (rev 23401) @@ -1 +1 @@ -8454e653d7ecca475153cc88fd1daa26 geos-3.3.3.tar.bz2 +fc5df2d926eb7e67f988a43a92683bae geos-3.4.2.tar.bz2 Added: csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch =================================================================== --- csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch (rev 0) +++ csw/mgar/pkg/geos/trunk/files/0000-use-namespace-std-on-isnan-when-building-on-solaris-.patch 2014-04-12 18:43:24 UTC (rev 23401) @@ -0,0 +1,32 @@ +From d1b3bd222d685d5d83b777fbf9fedff59eed8685 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 30 Mar 2014 11:00:12 +0200 +Subject: [PATCH] use namespace std on isnan when building on solaris with g++ + +--- + include/geos/platform.h.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in +index ab63929..a12cf42 100644 +--- a/include/geos/platform.h.in ++++ b/include/geos/platform.h.in +@@ -92,11 +92,13 @@ extern "C" + // sandro furieri: sanitizing MinGW32 + # define ISNAN(x) (std::isnan(x)) + # elif defined(__OSX__) || defined(__APPLE__) || \ +- defined(__NetBSD__) || defined(__DragonFly__) || \ +- (defined(__sun) && defined(__GNUC__)) ++ defined(__NetBSD__) || defined(__DragonFly__) + // Hack for OS/X incorrectly re-defining isnan() into oblivion. + // It does leave a version in std. + # define ISNAN(x) (std::isnan(x)) ++# elif (defined(__sun) && defined(__GNUC__)) ++# include ++# define ISNAN(x) (std::isnan(x)) + # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC) + # include + # define ISNAN(x) (::isnan(x)) +-- +1.8.4.1 + Deleted: csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch =================================================================== --- csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch 2014-04-12 18:36:59 UTC (rev 23400) +++ csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch 2014-04-12 18:43:24 UTC (rev 23401) @@ -1,27 +0,0 @@ -From 27c0baa1a85d3ae19d869979591cf41924a2c4b5 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 21 Apr 2012 23:01:26 +0200 -Subject: [PATCH] use namespace std on isnan when building on solaris with g++ - -Signed-off-by: Ben Walton ---- - include/geos/platform.h.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in -index effcdb5..2504b15 100644 ---- a/include/geos/platform.h.in -+++ b/include/geos/platform.h.in -@@ -95,6 +95,9 @@ extern "C" - // Hack for OS/X incorrectly re-defining isnan() into oblivion. - // It does leave a version in std. - # define ISNAN(x) (std::isnan(x)) -+# elif (defined(__sun) || defined(__sun__)) && defined(__GNUG__) -+# include -+# define ISNAN(x) (std::isnan(x)) - # elif defined(__sun) || defined(__sun__) - # include - # define ISNAN(x) (::isnan(x)) --- -1.7.10 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 20:47:30 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 18:47:30 +0000 Subject: SF.net SVN: gar:[23402] csw/mgar/pkg/geos/trunk/files/ 0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch Message-ID: <3g5lT63JLHzW6@mail.opencsw.org> Revision: 23402 http://sourceforge.net/p/gar/code/23402 Author: guengel Date: 2014-04-12 18:47:27 +0000 (Sat, 12 Apr 2014) Log Message: ----------- geos/trunk: Removed unused patch file. Removed Paths: ------------- csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch Deleted: csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch =================================================================== --- csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch 2014-04-12 18:43:24 UTC (rev 23401) +++ csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch 2014-04-12 18:47:27 UTC (rev 23402) @@ -1,50 +0,0 @@ -From d4f1d807146bfe7c406fd3cc30e59f9e7e4c52a0 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sun, 22 Apr 2012 03:24:14 +0200 -Subject: [PATCH] drop use of macro in test suite that conflicts with required - change for real code (a bad hack, yes) - -Signed-off-by: Ben Walton ---- - tests/unit/geom/CoordinateArraySequenceTest.cpp | 2 +- - tests/unit/io/WKBWriterTest.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/unit/geom/CoordinateArraySequenceTest.cpp b/tests/unit/geom/CoordinateArraySequenceTest.cpp -index e46f102..67b666a 100644 ---- a/tests/unit/geom/CoordinateArraySequenceTest.cpp -+++ b/tests/unit/geom/CoordinateArraySequenceTest.cpp -@@ -30,7 +30,7 @@ namespace tut - Filter() : is3d(false) {} - void filter_rw(geos::geom::Coordinate* c) const { - if ( is3d ) { -- if ( ISNAN(c->z) ) c->z = 0.0; -+ if ( __builtin_isnan(c->z) ) c->z = 0.0; - } - else c->z = DoubleNotANumber; - } -diff --git a/tests/unit/io/WKBWriterTest.cpp b/tests/unit/io/WKBWriterTest.cpp -index 13f158f..43c0318 100644 ---- a/tests/unit/io/WKBWriterTest.cpp -+++ b/tests/unit/io/WKBWriterTest.cpp -@@ -76,7 +76,7 @@ namespace tut - ensure( geom->getCoordinateDimension() == 2 ); - ensure( geom->getCoordinate()->x == -117.0 ); - ensure( geom->getCoordinate()->y == 33.0 ); -- ensure( ISNAN(geom->getCoordinate()->z) != 0 ); -+ ensure( __builtin_isnan(geom->getCoordinate()->z) != 0 ); - - delete geom; - } -@@ -128,7 +128,7 @@ namespace tut - ensure( geom->getCoordinateDimension() == 2 ); - ensure( geom->getCoordinate()->x == -117.0 ); - ensure( geom->getCoordinate()->y == 33.0 ); -- ensure( ISNAN(geom->getCoordinate()->z) != 0); -+ ensure( __builtin_isnan(geom->getCoordinate()->z) != 0); - - delete geom; - } --- -1.7.10 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 12 22:29:57 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 12 Apr 2014 20:29:57 +0000 Subject: SF.net SVN: gar:[23403] csw/mgar/pkg/geos/trunk/Makefile Message-ID: <3g5nlN2rhpzcf@mail.opencsw.org> Revision: 23403 http://sourceforge.net/p/gar/code/23403 Author: guengel Date: 2014-04-12 20:29:57 +0000 (Sat, 12 Apr 2014) Log Message: ----------- geos/trunk: Added OVERRIDES. Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2014-04-12 18:47:27 UTC (rev 23402) +++ csw/mgar/pkg/geos/trunk/Makefile 2014-04-12 20:29:57 UTC (rev 23403) @@ -26,6 +26,14 @@ PKGFILES_CSWlibgeos3-4-2 += $(call baseisadirs,$(libdir),libgeos-3\.4\.2\.so(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibgeos3-4-2 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgeos3-4-2 += CSWlibgcc-s1 +# Can't change this, obviously developers decided to do so +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.4.2.so +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libgeos-3.4.2.so +# Direct binding messes with unwind handler. We require the unwind handler from libgcc_s.so +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libstdc++.so.6 +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libstdc++.so.6 OBSOLETED_BY_CSWlibgeos3-4-2 = CSWgeos SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 @@ -34,6 +42,13 @@ RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-4-2 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgcc-s1 +# Direct binding messes with unwind handler. We require the unwind handler from libgcc_s.so +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgeos-3.4.2.so +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libstdc++.so.6 +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgeos-3.4.2.so +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libstdc++.so.6 OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files @@ -70,7 +85,9 @@ CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORY_MODEL)) -# -B direct breaks code amd64 +# -B direct breaks code amd64. N.B. the unwind handler from libgcc_s +# -has to be used, therefore libgcc_s has to be loaded before libc on +# -amd64. LINKER_DIRECT = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 13 02:31:31 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Apr 2014 00:31:31 +0000 Subject: SF.net SVN: gar:[23404] csw/mgar/pkg/opencsw-manual/trunk Message-ID: <3g5v6h6hTCznG@mail.opencsw.org> Revision: 23404 http://sourceforge.net/p/gar/code/23404 Author: wahwah Date: 2014-04-13 00:31:29 +0000 (Sun, 13 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Documentation updates; 2 pages moved from wordpress Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/fdl-1.3.txt csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst Removed Paths: ------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2014-04-13 00:31:29 UTC (rev 23404) @@ -49,17 +49,17 @@ rsync -rv $(WORKSRC)/_build/html/ $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) @$(MAKECOOKIE) -post-install-modulated: copy-to-web +post-install: copy-to-web @$(MAKECOOKIE) # define HTDOCS such as to be possible to install anywhere: copy-to-web: HTDOCS = $(HOME)/public_html copy-to-web: - if echo $(DESTDIR) | grep global; then :; else \ + if echo $(DESTDIR) | grep global >/dev/null; then :; else \ if [ -d $(HTDOCS)/opencsw-manual ]; then \ - rsync -rv $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ + rsync -rv --delete $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ $(HTDOCS)/opencsw-manual; \ - fi \ + fi; \ fi .PHONY: copy-to-web Added: csw/mgar/pkg/opencsw-manual/trunk/files/fdl-1.3.txt =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/fdl-1.3.txt (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/fdl-1.3.txt 2014-04-13 00:31:29 UTC (rev 23404) @@ -0,0 +1,451 @@ + + GNU Free Documentation License + Version 1.3, 3 November 2008 + + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The "publisher" means any person or entity that distributes copies of +the Document to the public. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. + +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. Deleted: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -1,46 +0,0 @@ -==================== -Configuring services -==================== - -/etc/opt/csw vs. /opt/csw/etc ------------------------------ - -There are two locations where configuration files are stored. This may look -confusing at first, the reason is that we try to support both sparse zones and -full zones as good as possible. Remember that in a sparse root environment -``/opt`` is shared from the global zone. As a rule of thumb configuration files -which are specific to a zone are kept in ``/etc/opt/csw`` which is also -generally preferred (these are in fact most of the configuration files), -whereas ``/opt/csw/etc`` is used for configuration files which are globally -set. Some packages honour both locations, where the global ``/opt/csw/etc`` is -read first and can be customized by ``/etc/opt/csw``, but this is specific to -the package as not all upstream software allows this easily. - -There are some exceptions like Apache, where the configuration files are -historically in ``/opt/csw/apache2/etc``, but these are likely to go away some -time. - -pkgutil -+++++++ - -``pkgutil`` can use **two** configuration files: - -- ``/etc/opt/csw/pkgutil.conf`` -- ``/opt/csw/etc/pkgutil.conf`` - -This may seem confusing, the reason why there are two is that it is possible to -run OpenCSW in a sparse root environment where ``/opt`` is not writable. In -this scenario you use configurations in ``/opt/csw/etc`` for global settings -and ``/etc/opt/csw`` for zone-specific setting. Both ``pkgutil.conf`` are -identical on installation with all configuration options commented out, so you -can just pick one for now. As a rule of thumb it is recommended to prefer the -more prominent ``/etc/opt/csw``. - -preserveconf ------------- - -Configuration files are usually shipped as template with a `.CSW` suffix which -is copied during installation to the native name without the suffix. This file -is meant to be user-adjustable. On package deinstallation or update the -template is deinstalled whereas the configuration file without suffix is kept -unless it hasn't been modified. Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -0,0 +1,80 @@ +-------------------------- +Frequently Asked Questions +-------------------------- + +Are services started by default? +================================ + +By default, services are started upon package installation. You can change that +by `disabling SMF in csw.conf`_. + +.. _disabling SMF in csw.conf: + http://wiki.opencsw.org/cswclassutils-package#toc10 + +If you disable service startup by default, and you are using OpenSSH from +OpenCSW, and you upgrade the openssh package, the ssh service will not be +started by default, locking you out of the system. Make sure you make an +additional entry telling the SSH service to start automatically. + +How can I install CSW packages in a location other than ``/opt/csw``? +===================================================================== + +OpenCSW packages are not relocatable, so you can't install them in a location +other than /opt/csw. Even if the packages were relocatable from the package +system point of view, there are usually paths hard-coded within the packaged +applications that point to and rely on /opt/csw (for libraries, configuration +files, data files and such). Relocating such applications is +application-specific. + +How can I transfer packages to a computer without an Internet connection? +========================================================================= + +Have a look at pkgutil's ``--download``, ``--stream``, and ``--target`` +options. You can download packages for a specific platform with all +dependencies into one big file in order to transfer and install them on another +computer. + +Why do packages go by two names (e.g. CSWftype2 and freetype2)? +=============================================================== + +There are two names associated with every piece of software that we ship: a +package name (a.k.a. pkgname, or pkginst) and a catalog name. The package name +is used by the underlying Solaris SVR4 package management tools (pkgadd, pkgrm, +pkginfo), needs to fit historical limits (32 characters), and is sometimes +cryptically condensed. The catalog name has no significance to Solaris itself, +and is used by pkgutil and in package catalogs. + +Why not use third party dependencies? +===================================== + +Problems with declaring SUNW and SFW packages as dependencies are: + +* pkgutil can't download and install them, so declaring them as dependencies + won't help during installation +* they often contain old versions of software (or libraries), while OpenCSW + package need newer versions +* OpenCSW packages must be installable on multiple Solaris versions; a package + built for Solaris 9 will also install on Solaris 10. In many cases, the + required shared libraries are in packages of different names, e.g. 64-bit + version of libfoo.so.1 might be in SUNWfoo on Solaris 10 and SUNWfoox on + Solaris 9. + +Where are the Solaris 10 version of a package I'm looking at? +============================================================= + +As of April 2014 most packages are built for Solaris 10, but since it's +possible to install a Solaris 9 package on Solaris 10, we take advantage of +that fact and put Solaris 9 packages in Solaris 10 catalogs. + +There are cases where a package can benefit from features specific to Solaris +10, and we create separate Solaris 9 and Solaris 10 package builds. + +Are the binaries compiled for advanced Instruction Set Architectures? +===================================================================== + +Binaries are compiled for basic ISAs. In most cases, performance is not +significantly improved by compiling for advanced ISAs. For those cases where +it is, we usually provide cpu-optimized libraries. + +If you know of a specific binary that would benefit from cpu-specific +optimizations, feel free to contact this package's maintainer and ask about it. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -10,59 +10,35 @@ .. _pkgutil: http://pkgutil.net -Solaris 10 -^^^^^^^^^^ +Step 1: pkgutil +=============== +You can use ``pkgadd`` to download and install it from http in one step:: -On a Solaris 10 system, you can use the capacity of ``pkgadd`` to download -and install it via http in one step:: - pkgadd -d http://get.opencsw.org/now -You may need to specify a proxy with ``-x :``, be aware that there are -known issues with Squid and possibly other proxies. +You may need to specify a proxy with ``-x :``, be aware that there +are known issues with Squid and possibly other proxies. Also, ``pkgadd`` on +Solaris 8 and 9 does not support installation directly via http. In such case +you need to download pkgutil with a separate tool like wget, and install it +from disk:: -Solaris 8 and 9 -^^^^^^^^^^^^^^^ - -On Solaris 8 and 9 (or 10 if you have issues with the above ``pkgadd``) you -need to download the package manually (e.g. using wget) and then install it:: - wget http://mirror.opencsw.org/opencsw/pkgutil.pkg pkgadd -d pkgutil.pkg all -You can now start installing packages. For a list of available packages use:: +.. NOTE:: + Solaris 9 is on its way to deprecation. Solaris 9 catalogs get very few + package updates. - /opt/csw/bin/pkgutil -a +.. NOTE:: + Solaris 8 does not get any updates any more. As of April 2014, only the dublin release contains Solaris 8 packages. -For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of -``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. On -Solaris 10, you can do that by editing the ``/etc/default/login`` -file, uncomment the ``PATH`` and ``SUPATH`` variables definition, -adjust the values as required and log out and back in. -As the list is quite long and you probably have an idea what you are looking for the -list can be fuzzy-matched with:: +Skip to :ref:`Step 2: installing packages `. - root# pkgutil -a vim - common package catalog size - gvim CSWgvim 7.3.055,REV=2010.11.25 1.1 MB - vim CSWvim 7.3.055,REV=2010.11.25 1002.2 KB - vimrt CSWvimrt 7.3.055,REV=2010.11.25 7.3 MB +Optional: Selecting your package source +======================================= -Lets just go ahead and try one:: - - root# pkgutil -y -i vim - ... - root# vim - -Voila! You have installed your first package! - - ---------------------------------------------- -Selecting your mirror and the catalog release ---------------------------------------------- - Now that you are about to install lots of stuff it may be a good time to select one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors are listed at:: @@ -89,11 +65,12 @@ On the next catalog update with ``pkgutil -U`` the catalogs are pulled from the new mirror. +Skip to :ref:`Step 2: installing packages `. -------------------------------------- -Setting up cryptographic verification -------------------------------------- +Optional: Cryptographic verification +==================================== + The catalog is signed with PGP and it is a good idea to set up your system to verify the integrity of the catalog. As the catalog itself contains hashes for all packages in the catalog this ensures you actually install the packages @@ -150,17 +127,30 @@ Nothing to do. ... -------------------------------- -Installing other basic packages -------------------------------- +.. _getting-started-installing-packages: -Installing the following packages is optional but recommended to have -a coherent stack: +Step 2: installing packages +=========================== -* gzip -* coreutils -* wget +You can now start installing packages. For a list of available packages use:: -Finally, installing the ``gnulinks`` package and putting the -``/opt/csw/gnu`` value in the front of the list contained by the -``PATH`` variable, gives priority to basic utilities supplied by us. + /opt/csw/bin/pkgutil -a + +As the list is quite long and you probably have an idea what you are looking for the +list can be fuzzy-matched with:: + + root# /opt/csw/bin/pkgutil -a vim + common package catalog size + gvim CSWgvim 7.3.055,REV=2010.11.25 1.1 MB + vim CSWvim 7.3.055,REV=2010.11.25 1002.2 KB + vimrt CSWvimrt 7.3.055,REV=2010.11.25 7.3 MB + +Let's go ahead and try installing one:: + + root# /opt/csw/bin/pkgutil -y -i vim + ... + root# /opt/csw/bin/vim + +Voila! You have installed your first package! + +Continue to :ref:`Full setup `. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -1,19 +1,15 @@ -========================== -OpenCSW for Administrators -========================== +============================ +OpenCSW for System Engineers +============================ -A user's manual for people who manage Solaris systems with OpenCSW packages. +User's manual for people who manage Solaris systems and use OpenCSW packages. .. toctree:: :maxdepth: 1 introduction getting-started + setup installation-en-masse - configuring-services mirror-setup - -.. [#dagosscrapbook] - `Dago's Scrapbook`_ -.. _Dago's Scrapbook: - http://sourceforge.net/apps/trac/gar/wiki/DagosScrapbook + faq Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -2,31 +2,10 @@ Installing packages en masse ============================ --------------------- -Package dependencies --------------------- +--------------------------------------------------- +Installing on a host without an Internet connection +--------------------------------------------------- -The OpenCSW packages have been compiled to allow easy forward migration and -crossgrades/mixing between SPARC and x86_64 CPUs. That means the same version of the -package is available for Solaris 10 and 11 for both SPARC and x86. There are -some exceptions where the software is absolutely not available or has a version -mismatch (e.g. acroread). To allow this, there are usually no dependencies on -SUNW packages. This sometimes leads to large dependency chains (and people -thinking of OpenCSW packages as bloated) but that is the price to pay for -the interoperability and we feel that in times of ever growing disks the -flexibility is worth more than the saved bytes. - -Package dependencies are modeled in the OpenCSW catalogs to allow automatic -dependency resolution via pkgutil. To view the current dependencies for a -package you can use:: - - pkgutil --deptree - - --------------------------------------------------------------- -Creating a .pkg file for a host without an Internet connection --------------------------------------------------------------- - If you need to install a package with multiple dependencies on a host with no Internet access, you can use ``pkgutil`` to prepare a ``.pkg`` file with the whole dependency chain. This is much easier than copying dependencies one by @@ -46,6 +25,16 @@ The resulting package stream will be placed in the ``~/.pkgutil/packages`` directory. -This topic is also `discussed`_ on the community site. +This topic is also `discussed on the community site`_. -.. _discussed: http://www.opencsw.org/community/questions/92/installing-without-a-direct-internet-access +.. _discussed on the community site: http://www.opencsw.org/community/questions/92/installing-without-a-direct-internet-access + +----------------- +Large deployments +----------------- + +To manage package across multiple hosts, you can use a configuration management +system like puppet, see `Andy Botting's blog post`_ for an example. + +.. _Andy Botting's blog post: + http://www.andybotting.com/using-pkgutil-on-solaris-with-puppet-for-easy-package-management Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -1,17 +1,48 @@ ------------- -Introduction ------------- +--------------------------- +Introduction to the project +--------------------------- -The world of open source is big. Although Solaris releases do contain the -software companion disc, there's always more projects out there that can't -fit there. +The world of open source is big. Solaris releases do contain the software +companion disc which contains a number of precompiled packages with open source +software, but you will almost always need a piece of software that is missing +from the companion disc, or isn't up to date enough. -OpenCSW fills this gap by providing binary packages, together with their build -recipes. The packages can be installed comfortably with automatic dependency -resolution, and require root access to the machine. If you want to compile and -build packages on your own, the build recipes are available for all packages -too. +OpenCSW fills this gap by providing binary packages and the corresponding build +recipes. Installing our packages is easy: you can install a package with all +dependencies with a single command. -Solaris 10 is fully supported. Solaris 8 and 9 only get best effort support -level. As of January 2012, Solaris 8 catalogs do not get any updates, and -Solaris 9 catalogs only get some amount of updates. +If you want to build your own packages, build recipes for our package are +available in the `source code repository`_. + +The OpenCSW packages have been compiled to allow easy forward migration and +crossgrades/mixing between SPARC and x86_64 CPUs. That means the same version +of each package is available for Solaris 10 and 11, for both SPARC and Intel +architectures. There are some exceptions, where the software is not available +for one of the architectures, or has a version mismatch (e.g. acroread). + +For more information, you can watch our `project overview video`_ (1h). + + +Support for different Solaris versions +====================================== + +As of April 2014: + +* Solaris 11 ? can use OpenCSW packages thanks to the backward binary compatibility +* Solaris 10 ? is the main focus +* Solaris 9 ? best effort, occasional updates +* Solaris 8 ? no package updates at all + +Mailing lists +============= + +We suggest subscribing to our low traffic `announce list`_. + +.. _announce list: + https://lists.opencsw.org/mailman/listinfo/announce + +.. _source code repository: + https://sourceforge.net/p/gar/code/HEAD/tree/ + +.. _project overview video: + http://youtu.be/Qmv5tvHEf4Q Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -0,0 +1,102 @@ +.. _installation-full-setup: + +---------- +Full setup +---------- + +Optional: A few basic packages +============================== + +Installing the following packages is optional but recommended: + +* gzip +* coreutils +* wget + +Finally, installing the ``gnulinks`` package and putting the +``/opt/csw/gnu`` value in the front of the list contained by the +``PATH`` variable, gives priority to basic utilities supplied by us. + +PATH +==== + +For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of ``PATH``, +and ``/opt/csw/share/man`` in front of ``MANPATH``. On Solaris 10, you can do +that by editing the ``/etc/default/login`` file, uncomment the ``PATH`` and +``SUPATH`` variables definition, adjust the values as required and log out and +back in. + + +Gotcha: LD_LIBRARY_PATH +======================= + +LD_LIBRARY_PATH is an environment variable which can be used to make the +dynamic linker look for shared libraries in specific places. It is not +necessary to set it for OpenCSW binaries. All of them are built with the ``-R`` +flag, so each binary itself knows where to look for the shared objects. + +You do not need to set ``LD_LIBRARY_PATH`` system-wide; and if you do, you will +likely break your system, even to the point of locking yourself out. Some of +the library names clash between ``/usr/lib`` and ``/opt/csw/lib``, and if you +run the Solaris openssh daemon with ``LD_LIBRARY_PATH`` set to +``/opt/csw/lib``, ``/usr/lib/ssh/sshd`` will try to load libcrypto from +``/opt/csw/lib`` and fail. + + +Upgrading packages +================== + +You need to take care to keep your packages up to date. It doesn't happen +automatically out of the box. To upgrade packages, run:: + + pkgutil -U -u -y + +To automate this process across multiple hosts, you can use a configuration +management system like puppet. + + +/etc/opt/csw vs. /opt/csw/etc +============================= + +There are two locations where configuration files are stored. This may look +confusing at first, the reason is that we try to support both sparse zones and +full zones as good as possible. Remember that in a sparse root environment +``/opt`` is shared from the global zone. As a rule of thumb configuration files +which are specific to a zone are kept in ``/etc/opt/csw`` which is also +generally preferred (these are in fact most of the configuration files), +whereas ``/opt/csw/etc`` is used for configuration files which are globally +set. Some packages honour both locations, where the global ``/opt/csw/etc`` is +read first and can be customized by ``/etc/opt/csw``, but this is specific to +the package as not all upstream software allows this easily. + +There are some exceptions like Apache, where the configuration files are +historically in ``/opt/csw/apache2/etc``, but these are likely to go away some +time. + + +pkgutil +======= + +``pkgutil`` can use **two** configuration files: + +- ``/etc/opt/csw/pkgutil.conf`` +- ``/opt/csw/etc/pkgutil.conf`` + +This may seem confusing, the reason why there are two is that it is possible to +run OpenCSW in a sparse root environment where ``/opt`` is not writable. In +this scenario you use configurations in ``/opt/csw/etc`` for global settings +and ``/etc/opt/csw`` for zone-specific setting. Both ``pkgutil.conf`` are +identical on installation with all configuration options commented out, so you +can just pick one for now. As a rule of thumb it is recommended to prefer the +more prominent ``/etc/opt/csw``. + + +preserveconf +============ + +Configuration files are usually shipped as template with a ``.CSW`` suffix +which is copied during installation to the native name without the suffix. This +file is meant to be user-adjustable. On package deinstallation or update the +template is deinstalled whereas the configuration file without suffix is kept +unless it hasn't been modified. + Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -5,36 +5,8 @@ This is a manual for developers who want to build own software, using tools and libraries provided by OpenCSW. -.. _linking against OpenCSW libraries: +.. toctree:: + :maxdepth: 1 -Linking against OpenCSW libraries -================================= - -To build own software against libraries distributed by OpenCSW, install the -relevant ``*_dev`` packages. They contain the header files, and ``*.so`` -symlinks necessary during linking. - -When building againt OpenCSW software, aside from setting the ``PATH`` -correctly, these flags will typically make it work:: - - CPPFLAGS="-I/opt/csw/include" - LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" - PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" - -If you're building a 64-bit binary, use these:: - - CPPFLAGS="-I/opt/csw/include" - LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" - PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" - -64-bit libraries live in the ``/opt/csw/lib/sparcv9`` and/or -``/opt/csw/lib/amd64`` directories. The ``/opt/csw/lib/64`` path is -a symlink to a chosen architecture subdirectory. For example, on SPARC -``/opt/csw/lib/64`` is a symlink to ``/opt/csw/lib/sparcv9``. All -binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look -at that path and find their libraries. - - -.. _LD_LIBRARY_PATH - just say no: - https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt - + linking + upstream Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -0,0 +1,32 @@ +.. _linking against OpenCSW libraries: + +Linking against OpenCSW libraries +================================= + +To build own software against libraries distributed by OpenCSW, install the +relevant ``*_dev`` packages. They contain the header files, and ``*.so`` +symlinks necessary during linking. + +When building againt OpenCSW software, aside from setting the ``PATH`` +correctly, these flags will typically make it work:: + + CPPFLAGS="-I/opt/csw/include" + LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" + PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" + +If you're building a 64-bit binary, use these:: + + CPPFLAGS="-I/opt/csw/include" + LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" + PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" + +64-bit libraries live in the ``/opt/csw/lib/sparcv9`` and/or +``/opt/csw/lib/amd64`` directories. The ``/opt/csw/lib/64`` path is +a symlink to a chosen architecture subdirectory. For example, on SPARC +``/opt/csw/lib/64`` is a symlink to ``/opt/csw/lib/sparcv9``. All +binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look +at that path and find their libraries. + + +.. _LD_LIBRARY_PATH - just say no: + https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -0,0 +1,4 @@ +Bugs/issues filed by OpenCSW maintainers +======================================== + +OpenCSW maintainers Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst 2014-04-12 20:29:57 UTC (rev 23403) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst 2014-04-13 00:31:29 UTC (rev 23404) @@ -2,7 +2,7 @@ Catalog format -------------- -Catalog format in short:: +Space separated fields:: common version package file md5 size dependencies category i-dependencies @@ -10,17 +10,32 @@ bind 9.4.2,REV=2008.07.09_rev=p1 CSWbind bind-9.4.2,REV=2008.07.09_rev=p1-SunOS5.8-sparc-CSW.pkg.gz f68df57fcf54bfd37304b79d6f7eeacc 2954112 CSWcommon|CSWosslrt net none -Each field is space separated, the dependencies field can be split with -the pipe char, like in the example above with two dependencies. The same -goes for the category and incompatible dependencies fields. +The format of the ``dependencies`` and ``i-dependencies`` fields:: -A package can only occur once in the catalog, meaning that both package -names and catalog names must be unique in a catalog. +1. When the list is empty: ``none`` +2. When the list is non-empty, pipe-separated list of pkginst names: + ``CSWfoo|CSWbar`` +A package can only occur once in the catalog, meaning that both package names +(pkginst) and catalog names must be unique in a catalog. + The catalog may have to be extended to support more features like if there's a source package available. In that case extra fields should be added to the end so not to break existing tools. +Signatures +========== + +A catalog file can be signed with gpg, cleartext style, with the signature +embedded in the file. + +CREATIONDATE +============ + +The first line can contain:: + + # CREATIONDATE 2014-03-16T08:39:58Z + See also: * `Building a catalog`_ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 13 10:20:47 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Apr 2014 08:20:47 +0000 Subject: SF.net SVN: gar:[23405] csw/mgar/pkg/opencsw-manual/trunk Message-ID: <3g65Wb19W6z16c@mail.opencsw.org> Revision: 23405 http://sourceforge.net/p/gar/code/23405 Author: wahwah Date: 2014-04-13 08:20:45 +0000 (Sun, 13 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Add a check for documentation version Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile csw/mgar/pkg/opencsw-manual/trunk/files/conf.py csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/check.sh Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2014-04-13 00:31:29 UTC (rev 23404) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2014-04-13 08:20:45 UTC (rev 23405) @@ -16,8 +16,9 @@ DESCRIPTION = OpenCSW manual VENDOR_URL = http://www.opencsw.org -MASTER_SITES = http://www.gnu.org/licenses/ +MASTER_SITES = DISTFILES = fdl-1.3.txt +DISTFILES += check.sh CONFIGURE_SCRIPTS = BUILD_SCRIPTS = manual INSTALL_SCRIPTS = manual @@ -50,6 +51,7 @@ @$(MAKECOOKIE) post-install: copy-to-web + $(WORKSRC)/check.sh $(WORKSRC)/conf.py @$(MAKECOOKIE) # define HTDOCS such as to be possible to install anywhere: Added: csw/mgar/pkg/opencsw-manual/trunk/files/check.sh =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/check.sh (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/check.sh 2014-04-13 08:20:45 UTC (rev 23405) @@ -0,0 +1,20 @@ +#!/opt/csw/bin/bash + +PATH=/opt/csw/gnu:/opt/csw/bin:/usr/bin + +CONF=$1 + +DATESTAMP_CONF=$(grep ^version "${CONF}" | cut -d= -f2 \ + | sed -e 's+[^0-9]*\([0-9\.]*\)[^0-9]*+\1+') +DATESTAMP_CLOCK=$(date '+0.%Y.%m') + +if [[ "${DATESTAMP_CONF}" != "${DATESTAMP_CLOCK}" ]]; then + echo >&2 + echo >&2 '*****' + echo >&2 "Please update the version setting in conf.py to ${DATESTAMP_CLOCK}" + echo >&2 '*****' + echo >&2 + exit 1 +fi + +exit 0 Property changes on: csw/mgar/pkg/opencsw-manual/trunk/files/check.sh ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Modified: csw/mgar/pkg/opencsw-manual/trunk/files/conf.py =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/conf.py 2014-04-13 00:31:29 UTC (rev 23404) +++ csw/mgar/pkg/opencsw-manual/trunk/files/conf.py 2014-04-13 08:20:45 UTC (rev 23405) @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '0.1' +version = '0.2014.04' # The full version, including alpha/beta/rc tags. -release = '0.1' +release = '0.2014.04' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-13 00:31:29 UTC (rev 23404) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-13 08:20:45 UTC (rev 23405) @@ -29,10 +29,8 @@ How can I transfer packages to a computer without an Internet connection? ========================================================================= -Have a look at pkgutil's ``--download``, ``--stream``, and ``--target`` -options. You can download packages for a specific platform with all -dependencies into one big file in order to transfer and install them on another -computer. +Please see :ref:`installing on a host without an Internet connection +`. Why do packages go by two names (e.g. CSWftype2 and freetype2)? =============================================================== Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2014-04-13 00:31:29 UTC (rev 23404) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2014-04-13 08:20:45 UTC (rev 23405) @@ -2,6 +2,8 @@ Installing packages en masse ============================ +.. _installing-on-a-host-without-an-internet-connection: + --------------------------------------------------- Installing on a host without an Internet connection --------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 13 13:01:06 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 11:01:06 +0000 Subject: SF.net SVN: gar:[23406] csw/mgar/pkg/geos/trunk/Makefile Message-ID: <3g694d32lfzXD@mail.opencsw.org> Revision: 23406 http://sourceforge.net/p/gar/code/23406 Author: guengel Date: 2014-04-13 11:01:04 +0000 (Sun, 13 Apr 2014) Log Message: ----------- geos/trunk: Added OVERRIDES for x86. Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2014-04-13 08:20:45 UTC (rev 23405) +++ csw/mgar/pkg/geos/trunk/Makefile 2014-04-13 11:01:04 UTC (rev 23406) @@ -29,7 +29,10 @@ # Can't change this, obviously developers decided to do so CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.4.2.so CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libgeos-3.4.2.so +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += soname-equals-filename|file=/opt/csw/lib/amd64/libgeos-3.4.2.so # Direct binding messes with unwind handler. We require the unwind handler from libgcc_s.so +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/amd64/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/amd64/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libstdc++.so.6 CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libgcc_s.so.1 CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libstdc++.so.6 CHECKPKG_OVERRIDES_CSWlibgeos3-4-2 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos-3.4.2.so|is|not|directly|bound|to|soname|libgcc_s.so.1 @@ -49,6 +52,9 @@ CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgcc_s.so.1 CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgeos-3.4.2.so CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/sparcv9/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libstdc++.so.6 +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/amd64/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/amd64/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libgeos-3.4.2.so +CHECKPKG_OVERRIDES_CSWlibgeos-c1 += no-direct-binding|/opt/csw/lib/amd64/libgeos_c.so.1.8.2|is|not|directly|bound|to|soname|libstdc++.so.6 OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 13 13:18:04 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Apr 2014 11:18:04 +0000 Subject: SF.net SVN: gar:[23407] csw/mgar/pkg/opencsw-manual/trunk/files/ for-developers Message-ID: <3g69S70D56zbq@mail.opencsw.org> Revision: 23407 http://sourceforge.net/p/gar/code/23407 Author: wahwah Date: 2014-04-13 11:18:03 +0000 (Sun, 13 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Simplified the layout of the for-developers part Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst Removed Paths: ------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2014-04-13 11:01:04 UTC (rev 23406) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2014-04-13 11:18:03 UTC (rev 23407) @@ -5,8 +5,35 @@ This is a manual for developers who want to build own software, using tools and libraries provided by OpenCSW. -.. toctree:: - :maxdepth: 1 +.. _linking against OpenCSW libraries: - linking - upstream +Linking against OpenCSW libraries +================================= + +To build own software against libraries distributed by OpenCSW, install the +relevant ``*_dev`` packages. They contain the header files, and ``*.so`` +symlinks necessary during linking. + +When building againt OpenCSW software, aside from setting the ``PATH`` +correctly, these flags will typically make it work:: + + CPPFLAGS="-I/opt/csw/include" + LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" + PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" + +If you're building a 64-bit binary, use these:: + + CPPFLAGS="-I/opt/csw/include" + LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" + PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" + +64-bit libraries live in the ``/opt/csw/lib/sparcv9`` and/or +``/opt/csw/lib/amd64`` directories. The ``/opt/csw/lib/64`` path is +a symlink to a chosen architecture subdirectory. For example, on SPARC +``/opt/csw/lib/64`` is a symlink to ``/opt/csw/lib/sparcv9``. All +binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look +at that path and find their libraries. + + +.. _LD_LIBRARY_PATH - just say no: + https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt Deleted: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst 2014-04-13 11:01:04 UTC (rev 23406) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/linking.rst 2014-04-13 11:18:03 UTC (rev 23407) @@ -1,32 +0,0 @@ -.. _linking against OpenCSW libraries: - -Linking against OpenCSW libraries -================================= - -To build own software against libraries distributed by OpenCSW, install the -relevant ``*_dev`` packages. They contain the header files, and ``*.so`` -symlinks necessary during linking. - -When building againt OpenCSW software, aside from setting the ``PATH`` -correctly, these flags will typically make it work:: - - CPPFLAGS="-I/opt/csw/include" - LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" - PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" - -If you're building a 64-bit binary, use these:: - - CPPFLAGS="-I/opt/csw/include" - LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" - PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" - -64-bit libraries live in the ``/opt/csw/lib/sparcv9`` and/or -``/opt/csw/lib/amd64`` directories. The ``/opt/csw/lib/64`` path is -a symlink to a chosen architecture subdirectory. For example, on SPARC -``/opt/csw/lib/64`` is a symlink to ``/opt/csw/lib/sparcv9``. All -binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look -at that path and find their libraries. - - -.. _LD_LIBRARY_PATH - just say no: - https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt Deleted: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst 2014-04-13 11:01:04 UTC (rev 23406) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/upstream.rst 2014-04-13 11:18:03 UTC (rev 23407) @@ -1,4 +0,0 @@ -Bugs/issues filed by OpenCSW maintainers -======================================== - -OpenCSW maintainers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 13 16:47:12 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 14:47:12 +0000 Subject: SF.net SVN: gar:[23408] csw/mgar/pkg/proj/trunk Message-ID: <3g6G5P5tQKz19x@mail.opencsw.org> Revision: 23408 http://sourceforge.net/p/gar/code/23408 Author: guengel Date: 2014-04-13 14:47:10 +0000 (Sun, 13 Apr 2014) Log Message: ----------- proj/trunk: Bumped to proj 4.8.0. Enabled BUILD64. Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile csw/mgar/pkg/proj/trunk/checksums Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2014-04-13 11:18:03 UTC (rev 23407) +++ csw/mgar/pkg/proj/trunk/Makefile 2014-04-13 14:47:10 UTC (rev 23408) @@ -1,9 +1,12 @@ # $Id$ NAME = proj -VERSION = 4.7.0 +VERSION = 4.8.0 GARTYPE = v2 +GARCOMPILER = GNU +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = Cartographic Projections Library define BLURB The PROJ.4 Cartographic Projections library was originally written by Gerald Evenden then of the USGS. @@ -13,10 +16,8 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += $(NAME)-datumgrid-1.5.zip -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) - PACKAGES = CSWproj CSWproj-dev CSWlibproj0 CSWproj-data CATALOGNAME_CSWproj = $(NAME) @@ -26,7 +27,7 @@ CATALOGNAME_CSWlibproj0 = libproj0 SPKG_DESC_CSWlibproj0 += Cartographic Projections Library, libproj.so.0 -PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0\.6\.6) +PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0\.7\.0) PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibproj0 = CSWproj-data CHECKPKG_OVERRIDES_CSWlibproj0 += surplus-dependency|CSWproj-data @@ -41,6 +42,10 @@ SPKG_DESC_CSWproj-data = Data files used by $(NAME) PKGFILES_CSWproj-data = /opt/csw/share/$(NAME)/.* +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_ARGS += --without-jni + include gar/category.mk zip-extract-proj-datumgrid-1.5.zip: Modified: csw/mgar/pkg/proj/trunk/checksums =================================================================== --- csw/mgar/pkg/proj/trunk/checksums 2014-04-13 11:18:03 UTC (rev 23407) +++ csw/mgar/pkg/proj/trunk/checksums 2014-04-13 14:47:10 UTC (rev 23408) @@ -1,2 +1,2 @@ -927d34623b52e0209ba2bfcca18fe8cd proj-4.7.0.tar.gz +d815838c92a29179298c126effbb1537 proj-4.8.0.tar.gz f5bf28a2a9c6afe9a3f670f0c0adb783 proj-datumgrid-1.5.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 13 18:06:30 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 16:06:30 +0000 Subject: SF.net SVN: gar:[23409] csw/mgar/pkg/proj/trunk/Makefile Message-ID: <3g6Hrt3LW9z1TH@mail.opencsw.org> Revision: 23409 http://sourceforge.net/p/gar/code/23409 Author: guengel Date: 2014-04-13 16:06:27 +0000 (Sun, 13 Apr 2014) Log Message: ----------- proj/trunk: Added libgcc-s1 as dependency. Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2014-04-13 14:47:10 UTC (rev 23408) +++ csw/mgar/pkg/proj/trunk/Makefile 2014-04-13 16:06:27 UTC (rev 23409) @@ -30,6 +30,7 @@ PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0\.7\.0) PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibproj0 = CSWproj-data +RUNTIME_DEP_PKGS_CSWlibproj0 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibproj0 += surplus-dependency|CSWproj-data CATALOGNAME_CSWproj-dev = proj_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 13 19:34:05 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 17:34:05 +0000 Subject: SF.net SVN: gar:[23410] csw/mgar/pkg/gdal/trunk Message-ID: <3g6Kp06SsXz4q@mail.opencsw.org> Revision: 23410 http://sourceforge.net/p/gar/code/23410 Author: guengel Date: 2014-04-13 17:34:04 +0000 (Sun, 13 Apr 2014) Log Message: ----------- gdal/trunk: Bumped to upstream release 1.9.2. Install libraries in /opt/csw/lib. Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile csw/mgar/pkg/gdal/trunk/checksums Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 16:06:27 UTC (rev 23409) +++ csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 17:34:04 UTC (rev 23410) @@ -1,6 +1,6 @@ # $Id$ NAME = gdal -VERSION = 1.9.1 +VERSION = 1.9.2 GARTYPE = v2 DESCRIPTION = Geospatial Data Abstraction Library @@ -14,12 +14,6 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-Force-use-of-double-data-type-before-checking-for-is.patch -PATCHFILES += 0002-apply-patch-from-upstream-to-handle-building-with-a-.patch -PATCHFILES += 0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch -PATCHFILES += 0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch -PATCHFILES += 0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch -#PATCHFILES += 0001-Force-the-use-of-CSWbash.patch BUILD_DEP_PKGS += CSWgeos-dev @@ -28,7 +22,7 @@ SPKG_DESC_CSWgdal = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgdal += CSWlibgif4 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgeos-c1 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1-gxx +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgdal += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibstdc++6 @@ -47,68 +41,56 @@ RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2 -PACKAGES += CSWlibgdal1-gxx -OBSOLETED_BY_CSWlibgdal1-gxx = CSWlibgdal1 -CATALOGNAME_CSWlibgdal1-gxx = libgdal1_gxx -SPKG_DESC_CSWlibgdal1-gxx += Geospatial Data Abstraction Library, libgdal.so.1 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibhdf5-7 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWjasper -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibnetcdf7 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgeos-c1 -PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) -PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) +PACKAGES += CSWlibgdal1 +OBSOLETED_BY_CSWlibgdal1 = CSWlibgdal1-gxx +CATALOGNAME_CSWlibgdal1-gxx = libgdal1_gxx_stub +SPKG_DESC_CSWlibgdal1 += Geospatial Data Abstraction Library, libgdal.so.1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjasper +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgeos-c1 +PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.16\.0) +PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) PACKAGES += CSWgdal-dev CATALOGNAME_CSWgdal-dev = gdal_dev SPKG_DESC_CSWgdal-dev += Geospatial Data Abstraction Library, development files -RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1-gxx +RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1 PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config -libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) -includedir = /opt/csw/gxx/include +BUILD64 = 1 -# enable use of __func__ as required by patch 0004 -ifneq ($(GARCOMPILER),GNU) -EXTRA_CXXFLAGS += -features=extensions -endif - CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --datadir=$(datadir)/gdal-data CONFIGURE_ARGS += --with-libz=$(prefix) CONFIGURE_ARGS += --with-png=$(prefix) CONFIGURE_ARGS += --with-libtiff=$(prefix) CONFIGURE_ARGS += --with-jpeg=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) -CONFIGURE_ARGS += --with-mysql=/opt/csw/bin/mysql_config +CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config CONFIGURE_ARGS += --with-sqlite3=$(prefix) -CONFIGURE_ARGS += --with-pg=/opt/csw/bin/pg_config +CONFIGURE_ARGS += --with-pg=$(bindir)/pg_config # doesn't have tests? TEST_TARGET = LICENSE = LICENSE.TXT -EXTRA_LIB += /opt/csw/postgresql/lib EXTRA_LDFLAGS += -L$(libdir) -R$(libdir) include gar/category.mk - - - - -# to avoid the __sync_fetch_and_add4 issue (must be after including category) -ARCHFLAGS_GCC4_sparcvv8 = -m32 Modified: csw/mgar/pkg/gdal/trunk/checksums =================================================================== --- csw/mgar/pkg/gdal/trunk/checksums 2014-04-13 16:06:27 UTC (rev 23409) +++ csw/mgar/pkg/gdal/trunk/checksums 2014-04-13 17:34:04 UTC (rev 23410) @@ -1 +1 @@ -c5cf09b92dac1f5775db056e165b34f5 gdal-1.9.1.tar.gz +3f39db89f4710269b3a8bf94178e07aa gdal-1.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 13 20:31:59 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 18:31:59 +0000 Subject: SF.net SVN: gar:[23411] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: <3g6M5f6ByNzDJ@mail.opencsw.org> Revision: 23411 http://sourceforge.net/p/gar/code/23411 Author: guengel Date: 2014-04-13 18:31:58 +0000 (Sun, 13 Apr 2014) Log Message: ----------- gdal/trunk: Dropped support for mysql since it fails to link: ld: fatal: file /lib/libc.so: version SUNW_1.22.5 is unavailable: required by file /opt/csw/lib/libmysqlclient.so Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 17:34:04 UTC (rev 23410) +++ csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 18:31:58 UTC (rev 23411) @@ -82,7 +82,11 @@ CONFIGURE_ARGS += --with-libtiff=$(prefix) CONFIGURE_ARGS += --with-jpeg=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) -CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config +# Fails w/ +# ld: fatal: file /lib/libc.so: version 'SUNW_1.22.5' is unavailable: +# required by file /opt/csw/lib/libmysqlclient.so +#CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config +CONFIGURE_ARGS += --without-mysql CONFIGURE_ARGS += --with-sqlite3=$(prefix) CONFIGURE_ARGS += --with-pg=$(bindir)/pg_config 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 Apr 13 22:03:18 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Apr 2014 20:03:18 +0000 Subject: SF.net SVN: gar:[23412] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/introduction.rst Message-ID: <3g6P6663tJzND@mail.opencsw.org> Revision: 23412 http://sourceforge.net/p/gar/code/23412 Author: dmichelsen Date: 2014-04-13 20:03:16 +0000 (Sun, 13 Apr 2014) Log Message: ----------- opencsw-manual: Add link to Slideshare Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst 2014-04-13 18:31:58 UTC (rev 23411) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst 2014-04-13 20:03:16 UTC (rev 23412) @@ -20,7 +20,8 @@ architectures. There are some exceptions, where the software is not available for one of the architectures, or has a version mismatch (e.g. acroread). -For more information, you can watch our `project overview video`_ (1h). +For more information, you can watch our `project overview video`_ (1h) and +take a look at the `slide deck`_. Support for different Solaris versions @@ -46,3 +47,6 @@ .. _project overview video: http://youtu.be/Qmv5tvHEf4Q + +.. _slide deck: + http://de.slideshare.net/dmichelsen/opencsw-what-is-the-project-about This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Sun Apr 13 22:07:34 2014 From: laurent at opencsw.org (Laurent Blume) Date: Sun, 13 Apr 2014 22:07:34 +0200 Subject: SF.net SVN: gar:[23411] csw/mgar/pkg/gdal/trunk/Makefile In-Reply-To: <3g6M5f6ByNzDJ@mail.opencsw.org> References: <3g6M5f6ByNzDJ@mail.opencsw.org> Message-ID: <534AEE86.7090908@opencsw.org> Hello Rafi, Is that a new package? That requirement has been present for a while in MySQL, so I'm surprised. Wouldn't it be better to have the new package support SUNW_1.22.5 anyhow, as it's not quite new anymore? And well, users who want it will surely accept to patch a little to get MySQL support :-) Laurent On 13/04/2014 20:31, guengel at users.sourceforge.net wrote: > Revision: 23411 > http://sourceforge.net/p/gar/code/23411 > Author: guengel > Date: 2014-04-13 18:31:58 +0000 (Sun, 13 Apr 2014) > Log Message: > ----------- > gdal/trunk: Dropped support for mysql since it fails to link: ld: fatal: file /lib/libc.so: version SUNW_1.22.5 is unavailable: required by file /opt/csw/lib/libmysqlclient.so > > Modified Paths: > -------------- > csw/mgar/pkg/gdal/trunk/Makefile > > Modified: csw/mgar/pkg/gdal/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 17:34:04 UTC (rev 23410) > +++ csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 18:31:58 UTC (rev 23411) > @@ -82,7 +82,11 @@ > CONFIGURE_ARGS += --with-libtiff=$(prefix) > CONFIGURE_ARGS += --with-jpeg=$(prefix) > CONFIGURE_ARGS += --with-expat=$(prefix) > -CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config > +# Fails w/ > +# ld: fatal: file /lib/libc.so: version 'SUNW_1.22.5' is unavailable: > +# required by file /opt/csw/lib/libmysqlclient.so > +#CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config > +CONFIGURE_ARGS += --without-mysql > CONFIGURE_ARGS += --with-sqlite3=$(prefix) > CONFIGURE_ARGS += --with-pg=$(bindir)/pg_config > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > From guengel at users.sourceforge.net Sun Apr 13 22:35:51 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 20:35:51 +0000 Subject: SF.net SVN: gar:[23413] csw/mgar/pkg/yapet/trunk Message-ID: <3g6Pqh2Nj2zWN@mail.opencsw.org> Revision: 23413 http://sourceforge.net/p/gar/code/23413 Author: guengel Date: 2014-04-13 20:35:49 +0000 (Sun, 13 Apr 2014) Log Message: ----------- yapet/trunk: Bumped to version 1.0. Modified Paths: -------------- csw/mgar/pkg/yapet/trunk/Makefile csw/mgar/pkg/yapet/trunk/checksums Modified: csw/mgar/pkg/yapet/trunk/Makefile =================================================================== --- csw/mgar/pkg/yapet/trunk/Makefile 2014-04-13 20:03:16 UTC (rev 23412) +++ csw/mgar/pkg/yapet/trunk/Makefile 2014-04-13 20:35:49 UTC (rev 23413) @@ -1,8 +1,9 @@ # $Id$ # NAME = yapet -VERSION = 0.8pre2 +VERSION = 1.0 GARTYPE = v2 +GARCOMPILER = SOS12U3 DESCRIPTION = Text-based Password Manager define BLURB @@ -25,7 +26,7 @@ # UPSTREAM_MASTER_SITES = RUNTIME_DEP_PKGS = CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWlibncurses5 +RUNTIME_DEP_PKGS += CSWlibncursesw5 RUNTIME_DEP_PKGS += CSWlibintl8 BUILD_DEP_PKGS = CSWlibssl-dev @@ -35,6 +36,14 @@ EXTRA_INC = /opt/csw/include/ncurses EXTRA_CXXFLAGS += -norunpath +# Required to make the tests work +EXTRA_LD_OPTIONS = -L/opt/csw/lib + +# LC_ALL required since some source code files are encoded in UTF-8. +EXTRA_CONFIGURE_ENV = LC_ALL=en_US.UTF-8 +EXTRA_BUILD_ENV = LC_ALL=en_US.UTF-8 +EXTRA_TEST_ENV = TERM=xterm LC_ALL=en_US.UTF-8 + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/yapet/trunk/checksums =================================================================== --- csw/mgar/pkg/yapet/trunk/checksums 2014-04-13 20:03:16 UTC (rev 23412) +++ csw/mgar/pkg/yapet/trunk/checksums 2014-04-13 20:35:49 UTC (rev 23413) @@ -1 +1 @@ -da08d937e8eb3bcec206089ee765bda4 yapet-0.8pre2.tar.gz +aba50831724e22f9fc44c8b381ab2778 yapet-1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 13 22:39:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Apr 2014 20:39:53 +0000 Subject: SF.net SVN: gar:[23414] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: <3g6PwR0RCbzZg@mail.opencsw.org> Revision: 23414 http://sourceforge.net/p/gar/code/23414 Author: wahwah Date: 2014-04-13 20:39:52 +0000 (Sun, 13 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Updates to getting started Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst Removed Paths: ------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-staging.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-13 20:35:49 UTC (rev 23413) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-13 20:39:52 UTC (rev 23414) @@ -57,8 +57,8 @@ version of libfoo.so.1 might be in SUNWfoo on Solaris 10 and SUNWfoox on Solaris 9. -Where are the Solaris 10 version of a package I'm looking at? -============================================================= +Where is the Solaris 10 version of a package I'm looking at? +============================================================ As of April 2014 most packages are built for Solaris 10, but since it's possible to install a Solaris 9 package on Solaris 10, we take advantage of @@ -70,9 +70,12 @@ Are the binaries compiled for advanced Instruction Set Architectures? ===================================================================== -Binaries are compiled for basic ISAs. In most cases, performance is not -significantly improved by compiling for advanced ISAs. For those cases where -it is, we usually provide cpu-optimized libraries. +Binaries are compiled for basic ISAs. As of April 2014, it means pentium_pro on +Intel and sparcv8+ on SPARC. +In most cases, performance is not significantly improved by compiling for +advanced ISAs. For those cases where it is, we usually provide cpu-optimized +libraries. + If you know of a specific binary that would benefit from cpu-specific optimizations, feel free to contact this package's maintainer and ask about it. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-13 20:35:49 UTC (rev 23413) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-13 20:39:52 UTC (rev 23414) @@ -36,12 +36,10 @@ Skip to :ref:`Step 2: installing packages `. -Optional: Selecting your package source -======================================= +Optional: Selecting your mirror +=============================== -Now that you are about to install lots of stuff it may be a good time to select -one of the mirrors from ``mirror.opencsw.org`` close to you. The official -mirrors are listed at:: +For faster downloads, you can select a mirror geographically close to you. http://www.opencsw.org/get-it/mirrors/ @@ -50,10 +48,17 @@ mirror=http://mirror.opencsw.org/opencsw/unstable -By default, ``pkgutil`` is configured to use the ``testing`` catalog. You might -change it to ``unstable`` on your development hosts to catch any issues before -they hit the ``testing`` catalog. +Optional: Selecting the catalog release +======================================= + +By default, ``pkgutil`` is configured to use the ``testing`` catalog. See +:ref:`catalog releases ` for information on releases. + +You might want change it to ``unstable`` on your development hosts to catch any +issues before they hit the ``testing`` catalog. Or you can switch it to +``stable`` if you want no updates (except for new stable releases). + You can verify the setting with ``pkgutil -V`` :: ... @@ -63,7 +68,8 @@ noncsw false (default: false) ... -On the next catalog update with ``pkgutil -U`` the catalogs are pulled from the new mirror. +On the next catalog update with ``pkgutil -U`` the catalogs indexes are +downloaded from the new mirror. Skip to :ref:`Step 2: installing packages `. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst 2014-04-13 20:35:49 UTC (rev 23413) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst 2014-04-13 20:39:52 UTC (rev 23414) @@ -8,8 +8,8 @@ from the companion disc, or isn't up to date enough. OpenCSW fills this gap by providing binary packages and the corresponding build -recipes. Installing our packages is easy: you can install a package with all -dependencies with a single command. +recipes. Installing our packages is easy: you can install a package together +with all dependencies with a single command. If you want to build your own packages, build recipes for our package are available in the `source code repository`_. @@ -30,7 +30,7 @@ As of April 2014: * Solaris 11 ? can use OpenCSW packages thanks to the backward binary compatibility -* Solaris 10 ? is the main focus +* **Solaris 10 ? is the main focus** * Solaris 9 ? best effort, occasional updates * Solaris 8 ? no package updates at all Copied: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst (from rev 23413, csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-staging.rst) =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst 2014-04-13 20:39:52 UTC (rev 23414) @@ -0,0 +1,28 @@ +.. _catalog-releases: + +--------------- +Catalog staging +--------------- + +For releases and staging overview, see the releases and staging wiki page +Releases and Staging [#releases-and-staging-wiki]_, written in 2009. You can +also see the README file on the OpenCSW master mirror +[#opencsw-master-mirror]_. + +* **unstable** is a working catalog where package maintainers make changes at + will. Updates to unstable are pushed every 10 minutes (April 2014). +* **testing** is a symlink to a named release. It gets periodically updated + from the unstable catalog. As of March 2014, it is done infrequently, by a + human. +* **stable** is a symlink to a named release. Once a stable release is made, it + is not updated unless there are important security updates to be pushed. + +References +---------- + +.. [#releases-and-staging-wiki] `Releases and staging wiki page`_ +.. _Releases and staging wiki page: + http://wiki.opencsw.org/releases-and-staging +.. [#opencsw-master-mirror] `OpenCSW master mirror`_ +.. _OpenCSW master mirror: + http://mirror.opencsw.org/opencsw/ Deleted: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-staging.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-staging.rst 2014-04-13 20:35:49 UTC (rev 23413) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-staging.rst 2014-04-13 20:39:52 UTC (rev 23414) @@ -1,24 +0,0 @@ ---------------- -Catalog staging ---------------- - -For releases and staging overview, see the releases and staging wiki -page[#releases-and-staging-wiki]_, written in 2009. You can also see the README -file on the `OpenCSW master mirror`_. - -* unstable is a working catalog where package maintainers can make changes at - will. It is regenerated every few hours. -* testing is a symlink to a named release. It gets periodically updated from the - unstable catalog. As of March 2014, it is done infrequently, by a human. -* stable is a symlink to a named release. Once a stable release is made, it is - not updated unless there are important security updates to be pushed. - -Footnotes ---------- -.. [#releases-and-staging-wiki] - `Releases and staging wiki page`_ -.. _Releases and staging wiki page: - http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/ - lib/python/sharedlib_utils_test.py#L13 -.. _OpenCSW master mirror: - http://mirror.opencsw.org/opencsw/ Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2014-04-13 20:35:49 UTC (rev 23413) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2014-04-13 20:39:52 UTC (rev 23414) @@ -17,4 +17,4 @@ package-naming buildfarm-setup 32-bit-and-64-bit - catalog-staging + catalog-releases This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 13 22:41:24 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 13 Apr 2014 20:41:24 +0000 Subject: SF.net SVN: gar:[23415] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: <3g6Py63CfCzdx@mail.opencsw.org> Revision: 23415 http://sourceforge.net/p/gar/code/23415 Author: guengel Date: 2014-04-13 20:41:23 +0000 (Sun, 13 Apr 2014) Log Message: ----------- gdal/trunk: Updated RUNTIME_DEP_PKGS. Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 20:39:52 UTC (rev 23414) +++ csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 20:41:23 UTC (rev 23415) @@ -20,50 +20,31 @@ PACKAGES += CSWgdal CATALOGNAME_CSWgdal = gdal SPKG_DESC_CSWgdal = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgdal += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibgeos-c1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibhdf5-7 -RUNTIME_DEP_PKGS_CSWgdal += CSWjasper -RUNTIME_DEP_PKGS_CSWgdal += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibnetcdf7 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2 PACKAGES += CSWlibgdal1 OBSOLETED_BY_CSWlibgdal1 = CSWlibgdal1-gxx CATALOGNAME_CSWlibgdal1-gxx = libgdal1_gxx_stub SPKG_DESC_CSWlibgdal1 += Geospatial Data Abstraction Library, libgdal.so.1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgeos-c1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjasper1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibhdf5-7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjasper +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgeos-c1 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.16\.0) PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 13 22:43:49 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Apr 2014 20:43:49 +0000 Subject: SF.net SVN: gar:[23416] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/about-documentation.rst Message-ID: <3g6Q0s4cSfzpY@mail.opencsw.org> Revision: 23416 http://sourceforge.net/p/gar/code/23416 Author: wahwah Date: 2014-04-13 20:43:49 +0000 (Sun, 13 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Updated link to the main page Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst 2014-04-13 20:41:23 UTC (rev 23415) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst 2014-04-13 20:43:49 UTC (rev 23416) @@ -94,5 +94,5 @@ .. _OpenCSW wiki: http://wiki.opencsw.org/buildfarm .. _OpenCSW manual: http://www.opencsw.org/manual/ .. _GAR documentation: http://gar.opencsw.org/ -.. _Main OpenCSW website: http://www.opencsw.org/use-it/ +.. _Main OpenCSW website: http://www.opencsw.org/ .. _Community Q&A: http://www.opencsw.org/community/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Apr 14 09:07:07 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 14 Apr 2014 07:07:07 +0000 Subject: SF.net SVN: gar:[23417] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: <3g6gr518knz1Gr@mail.opencsw.org> Revision: 23417 http://sourceforge.net/p/gar/code/23417 Author: guengel Date: 2014-04-14 07:07:05 +0000 (Mon, 14 Apr 2014) Log Message: ----------- gdal/trunk: Fiddled around with OVERRIDES and DEPS. Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2014-04-13 20:43:49 UTC (rev 23416) +++ csw/mgar/pkg/gdal/trunk/Makefile 2014-04-14 07:07:05 UTC (rev 23417) @@ -24,6 +24,12 @@ RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgeos-c1 +# On sparc, those are required +CHECKPKG_OVERRIDES_CSWgdal += surplus-dependency|CSWlibgeos-c1 +CHECKPKG_OVERRIDES_CSWgdal += surplus-dependency|CSWlibhdf5-7 +CHECKPKG_OVERRIDES_CSWgdal += surplus-dependency|CSWlibiconv2 PACKAGES += CSWlibgdal1 OBSOLETED_BY_CSWlibgdal1 = CSWlibgdal1-gxx @@ -45,8 +51,13 @@ RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl1-0-0 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.16\.0) PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) +# On sparc, those are required +CHECKPKG_OVERRIDES_CSWlibgdal1 += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWlibgdal1 += surplus-dependency|CSWlibidn11 PACKAGES += CSWgdal-dev CATALOGNAME_CSWgdal-dev = gdal_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Apr 14 09:11:10 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 14 Apr 2014 07:11:10 +0000 Subject: SF.net SVN: gar:[23418] csw/mgar/pkg Message-ID: <3g6gwp5MFVz1LC@mail.opencsw.org> Revision: 23418 http://sourceforge.net/p/gar/code/23418 Author: guengel Date: 2014-04-14 07:11:06 +0000 (Mon, 14 Apr 2014) Log Message: ----------- postgis/trunk: Initial commit of PostGIS. Added Paths: ----------- csw/mgar/pkg/postgis/ csw/mgar/pkg/postgis/Makefile csw/mgar/pkg/postgis/branches/ csw/mgar/pkg/postgis/tags/ csw/mgar/pkg/postgis/trunk/ csw/mgar/pkg/postgis/trunk/Makefile csw/mgar/pkg/postgis/trunk/checksums csw/mgar/pkg/postgis/trunk/files/ csw/mgar/pkg/postgis/trunk/files/0000-Use-stdarg.h-only-if-__STDC__-is-defined-to-1.patch Added: csw/mgar/pkg/postgis/Makefile =================================================================== --- csw/mgar/pkg/postgis/Makefile (rev 0) +++ csw/mgar/pkg/postgis/Makefile 2014-04-14 07:11:06 UTC (rev 23418) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/postgis/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Date Revision Author HeadURL Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: csw/mgar/pkg/postgis/trunk =================================================================== --- csw/mgar/pkg/postgis/trunk 2014-04-14 07:07:05 UTC (rev 23417) +++ csw/mgar/pkg/postgis/trunk 2014-04-14 07:11:06 UTC (rev 23418) Property changes on: csw/mgar/pkg/postgis/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/postgis/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgis/trunk/Makefile (rev 0) +++ csw/mgar/pkg/postgis/trunk/Makefile 2014-04-14 07:11:06 UTC (rev 23418) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = postgis +VERSION = 2.1.1 +GARTYPE = v2 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +GARCOMPILER = GNU + +PATCHFILES += 0000-Use-stdarg.h-only-if-__STDC__-is-defined-to-1.patch + +MASTER_SITES = http://download.osgeo.org/postgis/source/ +DISTFILES = $(DISTNAME).tar.gz + +EXTRA_LINKER_FLAGS = -lm +EXTRA_CFLAGS = -std=c99 -D__EXTENSIONS__ +EXTRA_TEST_ENV = GDAL_DATA=/opt/csw/share/gdal-data + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/postgis/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: csw/mgar/pkg/postgis/trunk/checksums =================================================================== --- csw/mgar/pkg/postgis/trunk/checksums (rev 0) +++ csw/mgar/pkg/postgis/trunk/checksums 2014-04-14 07:11:06 UTC (rev 23418) @@ -0,0 +1 @@ +4af86a39e2e9dbf10fe894e03c2c7027 postgis-2.1.1.tar.gz Added: csw/mgar/pkg/postgis/trunk/files/0000-Use-stdarg.h-only-if-__STDC__-is-defined-to-1.patch =================================================================== --- csw/mgar/pkg/postgis/trunk/files/0000-Use-stdarg.h-only-if-__STDC__-is-defined-to-1.patch (rev 0) +++ csw/mgar/pkg/postgis/trunk/files/0000-Use-stdarg.h-only-if-__STDC__-is-defined-to-1.patch 2014-04-14 07:11:06 UTC (rev 23418) @@ -0,0 +1,143 @@ +From 89b5005b81ab3231c41a579d512dd6a9a90f4a7e Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 4 Apr 2014 13:58:38 +0200 +Subject: [PATCH] Use stdarg.h only if __STDC__ is defined to 1 + +--- + liblwgeom/liblwgeom.h.in | 6 +++++- + liblwgeom/liblwgeom_internal.h | 6 +++++- + liblwgeom/lwgeom.c | 6 +++++- + liblwgeom/lwgeom_log.h | 6 +++++- + liblwgeom/lwsegmentize.c | 6 +++++- + liblwgeom/lwutil.c | 6 +++++- + liblwgeom/stringbuffer.h | 8 ++++++-- + 7 files changed, 36 insertions(+), 8 deletions(-) + +diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in +index ab3807e..500e4a2 100644 +--- a/liblwgeom/liblwgeom.h.in ++++ b/liblwgeom/liblwgeom.h.in +@@ -16,7 +16,11 @@ + #ifndef _LIBLWGEOM_H + #define _LIBLWGEOM_H 1 + +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + #include + #include + #include "proj_api.h" +diff --git a/liblwgeom/liblwgeom_internal.h b/liblwgeom/liblwgeom_internal.h +index 0e63d1a..db6e425 100644 +--- a/liblwgeom/liblwgeom_internal.h ++++ b/liblwgeom/liblwgeom_internal.h +@@ -19,7 +19,11 @@ + #include "../postgis_config.h" + + #include +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + #include + #include + #include +diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c +index d2bd421..062d4cd 100644 +--- a/liblwgeom/lwgeom.c ++++ b/liblwgeom/lwgeom.c +@@ -12,7 +12,11 @@ + + #include + #include +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + + #include "liblwgeom_internal.h" + #include "lwgeom_log.h" +diff --git a/liblwgeom/lwgeom_log.h b/liblwgeom/lwgeom_log.h +index fb8bc00..108d366 100644 +--- a/liblwgeom/lwgeom_log.h ++++ b/liblwgeom/lwgeom_log.h +@@ -20,7 +20,11 @@ + #ifndef LWGEOM_LOG_H + #define LWGEOM_LOG_H 1 + +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + + /* + * Debug macros +diff --git a/liblwgeom/lwsegmentize.c b/liblwgeom/lwsegmentize.c +index 193ef03..7dbfdef 100644 +--- a/liblwgeom/lwsegmentize.c ++++ b/liblwgeom/lwsegmentize.c +@@ -12,7 +12,11 @@ + + #include + #include +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + #include + + #include "liblwgeom_internal.h" +diff --git a/liblwgeom/lwutil.c b/liblwgeom/lwutil.c +index 3c4a6bb..228ae0b 100644 +--- a/liblwgeom/lwutil.c ++++ b/liblwgeom/lwutil.c +@@ -1,6 +1,10 @@ + #include + #include +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + #include + + /* Global variables */ +diff --git a/liblwgeom/stringbuffer.h b/liblwgeom/stringbuffer.h +index 0574aea..34f6c26 100644 +--- a/liblwgeom/stringbuffer.h ++++ b/liblwgeom/stringbuffer.h +@@ -40,7 +40,11 @@ + #define _STRINGBUFFER_H 1 + + #include +-#include ++#if __STDC__ ++# include ++#else ++# include ++#endif + #include + #include + +@@ -69,4 +73,4 @@ extern char stringbuffer_lastchar(stringbuffer_t *s); + extern int stringbuffer_trim_trailing_white(stringbuffer_t *s); + extern int stringbuffer_trim_trailing_zeroes(stringbuffer_t *s); + +-#endif /* _STRINGBUFFER_H */ +\ No newline at end of file ++#endif /* _STRINGBUFFER_H */ +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 15 01:37:55 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Apr 2014 23:37:55 +0000 Subject: SF.net SVN: gar:[23419] csw/mgar/pkg/opencsw-manual/trunk/files/conf.py Message-ID: <3g75qP4MKJz1My@mail.opencsw.org> Revision: 23419 http://sourceforge.net/p/gar/code/23419 Author: wahwah Date: 2014-04-14 23:37:54 +0000 (Mon, 14 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Moving the menu bar to the right hand side, better for mobile devices Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/conf.py Modified: csw/mgar/pkg/opencsw-manual/trunk/files/conf.py =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/conf.py 2014-04-14 07:11:06 UTC (rev 23418) +++ csw/mgar/pkg/opencsw-manual/trunk/files/conf.py 2014-04-14 23:37:54 UTC (rev 23419) @@ -102,7 +102,7 @@ # documentation. #html_theme_options = {} html_theme_options = { - # "rightsidebar": "true", + "rightsidebar": "true", } # Add any paths that contain custom themes here, relative to this directory. 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 Apr 15 01:38:19 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Apr 2014 23:38:19 +0000 Subject: SF.net SVN: gar:[23420] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: <3g75qm6BXcz1RD@mail.opencsw.org> Revision: 23420 http://sourceforge.net/p/gar/code/23420 Author: wahwah Date: 2014-04-14 23:38:18 +0000 (Mon, 14 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Simplifying the getting started section Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-14 23:37:54 UTC (rev 23419) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-14 23:38:18 UTC (rev 23420) @@ -4,22 +4,30 @@ Getting started --------------- -OpenCSW uses a tool named pkgutil_ on top of the Solaris packaging utilities to -automatically download, install and update packages. It needs to be installed -manually once, after that all maintenance is done via ``pkgutil``. +:: -.. _pkgutil: http://pkgutil.net + pkgadd -d http://get.opencsw.org/now + /opt/csw/bin/pkgutil -U + /opt/csw/bin/pkgutil -a vim + /opt/csw/bin/pkgutil -y -i vim -Step 1: pkgutil -=============== +Done! -You can use ``pkgadd`` to download and install it from http in one step:: +Skip to :ref:`selecting your mirror `. - pkgadd -d http://get.opencsw.org/now +Behind a proxy +============== + You may need to specify a proxy with ``-x :``, be aware that there -are known issues with Squid and possibly other proxies. Also, ``pkgadd`` on -Solaris 8 and 9 does not support installation directly via http. In such case +are known issues with Squid and possibly other proxies:: + + pkgadd -x myproxy:3128 -d http://get.opencsw.org/now + +Solaris 8 or 9 +============== + +``pkgadd`` on Solaris 8 and 9 does not support installation directly via http. In such case you need to download pkgutil with a separate tool like wget, and install it from disk:: @@ -33,9 +41,8 @@ .. NOTE:: Solaris 8 does not get any updates any more. As of April 2014, only the dublin release contains Solaris 8 packages. +.. _selecting-mirror: -Skip to :ref:`Step 2: installing packages `. - Optional: Selecting your mirror =============================== @@ -71,9 +78,7 @@ On the next catalog update with ``pkgutil -U`` the catalogs indexes are downloaded from the new mirror. -Skip to :ref:`Step 2: installing packages `. - Optional: Cryptographic verification ==================================== @@ -133,30 +138,4 @@ Nothing to do. ... -.. _getting-started-installing-packages: - -Step 2: installing packages -=========================== - -You can now start installing packages. For a list of available packages use:: - - /opt/csw/bin/pkgutil -a - -As the list is quite long and you probably have an idea what you are looking for the -list can be fuzzy-matched with:: - - root# /opt/csw/bin/pkgutil -a vim - common package catalog size - gvim CSWgvim 7.3.055,REV=2010.11.25 1.1 MB - vim CSWvim 7.3.055,REV=2010.11.25 1002.2 KB - vimrt CSWvimrt 7.3.055,REV=2010.11.25 7.3 MB - -Let's go ahead and try installing one:: - - root# /opt/csw/bin/pkgutil -y -i vim - ... - root# /opt/csw/bin/vim - -Voila! You have installed your first package! - Continue to :ref:`Full setup `. 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 Apr 15 10:09:17 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Apr 2014 08:09:17 +0000 Subject: SF.net SVN: gar:[23421] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/setup.rst Message-ID: <3g7K9N0jlCzP3@mail.opencsw.org> Revision: 23421 http://sourceforge.net/p/gar/code/23421 Author: wahwah Date: 2014-04-15 08:09:16 +0000 (Tue, 15 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Small rewrites; setup.rst updated Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-14 23:38:18 UTC (rev 23420) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-15 08:09:16 UTC (rev 23421) @@ -7,15 +7,12 @@ Optional: A few basic packages ============================== -Installing the following packages is optional but recommended: +Optional but recommended: * gzip * coreutils * wget -Finally, installing the ``gnulinks`` package and putting the -``/opt/csw/gnu`` value in the front of the list contained by the -``PATH`` variable, gives priority to basic utilities supplied by us. PATH ==== @@ -27,20 +24,30 @@ back in. -Gotcha: LD_LIBRARY_PATH -======================= +Symlinks in /opt/csw/gnu +======================== +OpenCSW tries to avoid providing binaries which clash with those in +``/usr/bin``. Coreutils get a prefix for all the binary names, e.g. ``cp`` +becomes ``gcp``. Some packages provide symlinks with original file names, from +the ``/opt/csw/gnu`` directory, for example ``/opt/csw/gnu/cp`` is a symlink to +``/opt/csw/bin/gcp``. You can put ``/opt/csw/gnu`` in front of your ``PATH``. + + +Do not set LD_LIBRARY_PATH +========================== + LD_LIBRARY_PATH is an environment variable which can be used to make the dynamic linker look for shared libraries in specific places. It is not necessary to set it for OpenCSW binaries. All of them are built with the ``-R`` flag, so each binary itself knows where to look for the shared objects. -You do not need to set ``LD_LIBRARY_PATH`` system-wide; and if you do, you will +You do not need to set LD_LIBRARY_PATH system-wide; and if you do, you will likely break your system, even to the point of locking yourself out. Some of the library names clash between ``/usr/lib`` and ``/opt/csw/lib``, and if you -run the Solaris openssh daemon with ``LD_LIBRARY_PATH`` set to +run the Solaris openssh daemon with LD_LIBRARY_PATH set to ``/opt/csw/lib``, ``/usr/lib/ssh/sshd`` will try to load libcrypto from -``/opt/csw/lib`` and fail. +``/opt/csw/lib`` and fail to start. Upgrading packages @@ -77,7 +84,7 @@ pkgutil ======= -``pkgutil`` can use **two** configuration files: +pkgutil can use two configuration files: - ``/etc/opt/csw/pkgutil.conf`` - ``/opt/csw/etc/pkgutil.conf`` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Apr 16 14:08:48 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 16 Apr 2014 12:08:48 +0000 Subject: SF.net SVN: gar:[23422] csw/mgar/pkg/postgis/trunk/Makefile Message-ID: <3g82RQ4hH4z1RH@mail.opencsw.org> Revision: 23422 http://sourceforge.net/p/gar/code/23422 Author: guengel Date: 2014-04-16 12:08:48 +0000 (Wed, 16 Apr 2014) Log Message: ----------- Split into several packages. Modified Paths: -------------- csw/mgar/pkg/postgis/trunk/Makefile Modified: csw/mgar/pkg/postgis/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgis/trunk/Makefile 2014-04-15 08:09:16 UTC (rev 23421) +++ csw/mgar/pkg/postgis/trunk/Makefile 2014-04-16 12:08:48 UTC (rev 23422) @@ -1,13 +1,12 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# NAME = postgis VERSION = 2.1.1 GARTYPE = v2 -DESCRIPTION = Brief description +DESCRIPTION = Spatial and Geographic objects for PostgreSQL define BLURB - Long description + PostGIS is a spatial database extender for PostgreSQL object-relational database. It + adds support for geographic objects allowing location queries to be run in SQL. endef GARCOMPILER = GNU @@ -17,13 +16,48 @@ MASTER_SITES = http://download.osgeo.org/postgis/source/ DISTFILES = $(DISTNAME).tar.gz +PACKAGES = CSWpostgis +SPKG_DESC_CSWpostgis = PostGIS - Spatial and Geographic objects for PostgreSQL +RUNTIME_DEP_PKGS_CSWpostgis = CSWliblwgeom2-1-1 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibproj0 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpostgis += CSWperl +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibgdal1 +RUNTIME_DEP_PKGS_CSWpostgis += CSWlibgeos-c1 +# Required by sparc packages +CHECKPKG_OVERRIDES_CSWpostgis += surplus-dependency|CSWlibz1 + +PACKAGES += CSWliblwgeom2-1-1 +SPKG_DESC_CSWliblwgeom2-1-1 = PostGIS, liblwgeom library +PKGFILES_CSWliblwgeom2-1-1 = $(call pkgfiles_lib,liblwgeom-2.1.1.so) +RUNTIME_DEP_PKGS_CSWliblwgeom2-1-1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWliblwgeom2-1-1 += CSWlibproj0 +RUNTIME_DEP_PKGS_CSWliblwgeom2-1-1 += CSWlibgeos-c1 +CHECKPKG_OVERRIDES_CSWliblwgeom2-1-1 += soname-equals-filename|file=/opt/csw/lib/sparcv9/liblwgeom-2.1.1.so +CHECKPKG_OVERRIDES_CSWliblwgeom2-1-1 += soname-equals-filename|file=/opt/csw/lib/amd64/liblwgeom-2.1.1.so +CHECKPKG_OVERRIDES_CSWliblwgeom2-1-1 += soname-equals-filename|file=/opt/csw/lib/liblwgeom-2.1.1.so + + +PACKAGES += CSWliblwgeom-dev +SPKG_DESC_CSWliblwgeom-dev = PostGIS, liblwgeom header files +PKGFILES_CSWliblwgeom-dev = include/.* + EXTRA_LINKER_FLAGS = -lm EXTRA_CFLAGS = -std=c99 -D__EXTENSIONS__ -EXTRA_TEST_ENV = GDAL_DATA=/opt/csw/share/gdal-data CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 +# Tests require a working postgres installation with a user having +# permission to create databases. Further, we would need a 32bit and +# 64bit database server. +SKIPTEST = 1 + include gar/category.mk +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Apr 17 10:17:15 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 17 Apr 2014 08:17:15 +0000 Subject: SF.net SVN: gar:[23423] csw/mgar/pkg/lang-python Message-ID: <3g8YFc676sz1Sf@mail.opencsw.org> Revision: 23423 http://sourceforge.net/p/gar/code/23423 Author: cgrzemba Date: 2014-04-17 08:17:14 +0000 (Thu, 17 Apr 2014) Log Message: ----------- lang-python/apsw/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/apsw/ csw/mgar/pkg/lang-python/apsw/Makefile csw/mgar/pkg/lang-python/apsw/branches/ csw/mgar/pkg/lang-python/apsw/tags/ csw/mgar/pkg/lang-python/apsw/trunk/ csw/mgar/pkg/lang-python/apsw/trunk/Makefile csw/mgar/pkg/lang-python/apsw/trunk/checksums csw/mgar/pkg/lang-python/apsw/trunk/files/ Added: csw/mgar/pkg/lang-python/apsw/Makefile =================================================================== --- csw/mgar/pkg/lang-python/apsw/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/apsw/Makefile 2014-04-17 08:17:14 UTC (rev 23423) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/apsw/trunk =================================================================== --- csw/mgar/pkg/lang-python/apsw/trunk 2014-04-16 12:08:48 UTC (rev 23422) +++ csw/mgar/pkg/lang-python/apsw/trunk 2014-04-17 08:17:14 UTC (rev 23423) Property changes on: csw/mgar/pkg/lang-python/apsw/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/apsw/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/apsw/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/apsw/trunk/Makefile 2014-04-17 08:17:14 UTC (rev 23423) @@ -0,0 +1,20 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = apsw +VERSION = 3.8.2-r1 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Python implementation of + +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).zip + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/apsw/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/apsw/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/apsw/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/apsw/trunk/checksums 2014-04-17 08:17:14 UTC (rev 23423) @@ -0,0 +1 @@ +77103c13aeed2d6802bdd72d858114c6 apsw-3.8.2-r1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Apr 17 13:09:34 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 17 Apr 2014 11:09:34 +0000 Subject: SF.net SVN: gar:[23424] csw/mgar/pkg/postgis/trunk/Makefile Message-ID: <3g8d4R6Z4Bz7q@mail.opencsw.org> Revision: 23424 http://sourceforge.net/p/gar/code/23424 Author: guengel Date: 2014-04-17 11:09:34 +0000 (Thu, 17 Apr 2014) Log Message: ----------- postgis/trunk: Use proper *-config binaries for 64bit archs. Modified Paths: -------------- csw/mgar/pkg/postgis/trunk/Makefile Modified: csw/mgar/pkg/postgis/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgis/trunk/Makefile 2014-04-17 08:17:14 UTC (rev 23423) +++ csw/mgar/pkg/postgis/trunk/Makefile 2014-04-17 11:09:34 UTC (rev 23424) @@ -49,7 +49,11 @@ EXTRA_LINKER_FLAGS = -lm EXTRA_CFLAGS = -std=c99 -D__EXTENSIONS__ -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-xml2config=$(bindir)/xml2-config +CONFIGURE_ARGS += --with-pgconfig=$(bindir)/pg_config +CONFIGURE_ARGS += --with-geosconfig=$(bindir)/geos-config +CONFIGURE_ARGS += --with-gdalconfig=$(bindir)/gdal-config BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 18 11:07:32 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Apr 2014 09:07:32 +0000 Subject: SF.net SVN: gar:[23425] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: <3g9BKN5mr7z1Ky@mail.opencsw.org> Revision: 23425 http://sourceforge.net/p/gar/code/23425 Author: wahwah Date: 2014-04-18 09:07:31 +0000 (Fri, 18 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: about sparse zones Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2014-04-17 11:09:34 UTC (rev 23424) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2014-04-18 09:07:31 UTC (rev 23425) @@ -10,6 +10,7 @@ introduction getting-started setup + solaris-10-sparse-zones installation-en-masse mirror-setup faq Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-17 11:09:34 UTC (rev 23424) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-18 09:07:31 UTC (rev 23425) @@ -49,7 +49,11 @@ ``/opt/csw/lib``, ``/usr/lib/ssh/sshd`` will try to load libcrypto from ``/opt/csw/lib`` and fail to start. +For more information see `LD_LIBRARY_PATH - just say no`_. +.. _LD_LIBRARY_PATH - just say no: + https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt + Upgrading packages ================== Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 09:07:31 UTC (rev 23425) @@ -0,0 +1,37 @@ +----------------------- +Solaris 10 sparse zones +----------------------- + +1. set inherit-pkg-dir on ``/opt/csw`` +2. install packages in the global zone + +When inherited by non-global zones, ``/opt/csw`` is read-only. Two directories +that might need local (per-zone) modifications are ``etc`` and ``var``. +Instead of using ``/opt/csw/etc`` and ``/opt/csw/var`` (which are read-only), +we use ``/var/opt/csw`` and ``/etc/opt/csw`` instead. + +Most packages built after July 2010 support local ``var``. + + +Local mount hack (unsupported) +------------------------------ + +If you're using a package which wasn't configured to use ``/etc/opt/csw`` +and/or ``/var/opt/csw`` but you still need to have per-zone changes, you can +mount your own, writable ``/opt/csw/etc`` on top of the read only ``/opt/csw``:: + + # /etc/vfstab entries + /path/to/your/local/etc - /opt/csw/etc lofs - yes - + /path/to/your/local/var - /opt/csw/var lofs - yes - + +This is only a hack that might help you with a legacy package, it's not a +supported way of using OpenCSW packages. + +Sparse zone with shared ``/usr`` +-------------------------------- + +This setup won't work with OpenCSW packages, because the CSWcas-* package +family installs `class action scripts`_ into ``/usr``. + +.. _class action scripts: + http://wiki.opencsw.org/cswclassutils-package Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2014-04-17 11:09:34 UTC (rev 23424) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2014-04-18 09:07:31 UTC (rev 23425) @@ -27,13 +27,16 @@ LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" -64-bit libraries live in the ``/opt/csw/lib/sparcv9`` and/or -``/opt/csw/lib/amd64`` directories. The ``/opt/csw/lib/64`` path is -a symlink to a chosen architecture subdirectory. For example, on SPARC -``/opt/csw/lib/64`` is a symlink to ``/opt/csw/lib/sparcv9``. All -binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look -at that path and find their libraries. +64-bit libraries live in these directories, depending on the architecture:: + /opt/csw/lib/sparcv9 + /opt/csw/lib/amd64 -.. _LD_LIBRARY_PATH - just say no: - https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt +The ``/opt/csw/lib/64`` path is a symlink to a chosen architecture +subdirectory. For example, on SPARC ``/opt/csw/lib/64`` is a symlink to +``/opt/csw/lib/sparcv9``. + +All binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look at +that path and find their corresponding sparcv9 or amd64 libraries. This way you +can use the same ``-R`` flag for both sparc and intel 64-bit builds. + 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 Apr 18 17:12:50 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Apr 2014 15:12:50 +0000 Subject: SF.net SVN: gar:[23426] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators Message-ID: <3g9LQl699czCR@mail.opencsw.org> Revision: 23426 http://sourceforge.net/p/gar/code/23426 Author: wahwah Date: 2014-04-18 15:12:48 +0000 (Fri, 18 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Migrating from Blastwave Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/migrating-from-blastwave-to-opencsw.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2014-04-18 09:07:31 UTC (rev 23425) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2014-04-18 15:12:48 UTC (rev 23426) @@ -13,4 +13,5 @@ solaris-10-sparse-zones installation-en-masse mirror-setup + migrating-from-blastwave-to-opencsw faq Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/migrating-from-blastwave-to-opencsw.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/migrating-from-blastwave-to-opencsw.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/migrating-from-blastwave-to-opencsw.rst 2014-04-18 15:12:48 UTC (rev 23426) @@ -0,0 +1,56 @@ +----------------------------------- +Migrating from Blastwave to OpenCSW +----------------------------------- + +You cannot mix Blastwave packages with OpenCSW packages. + +You need to migrate your packages, which means you need to uninstall all +Blastwave packages and install corresponding OpenCSW packages. + +Instructions +------------ + +Install CSWpkgutil, it provides the admin file required later. + +Create a list of currently installed CSW packages (Blastwave uses CSW package +namespace), except CSWwget:: + + (cd /var/sadm/pkg; echo CSW*) | tr ' ' '\n' \ + | grep -v CSWwget | grep -v CSWpkgutil \ + > /var/tmp/before-migration.list + +Configure pkgutil to use an OpenCSW mirror. Do you have 2 copies of +pkgutil.conf, one in ``/opt/csw/etc`` and one in ``/etc/opt/csw``? Make sure +you only have one copy, use ``/etc/opt/csw`` as the location:: + + opencsw_mirror="http://mirror.opencsw.org/opencsw/unstable/" + cp /etc/opt/csw/pkgutil.conf /etc/opt/csw/pkgutil.conf.bak + gsed -e '/^\s*mirror=/d' -i /etc/opt/csw/pkgutil.conf + echo >> /etc/opt/csw/pkgutil.conf "mirror=${opencsw_mirror}" + +Uninstall all the packages from the list. In order to uninstall all the +packages in a batch mode, we need to use a so called admin file. There's one +provided by CSWpkgutil, ``/var/opt/csw/pkgutil/admin`` + +:: + + for pkg in `cat /var/tmp/before-migration.list`; do \ + pkgrm -n -a /var/opt/csw/pkgutil/admin $pkg; \ + done + +Update pkgutil's catalog cache:: + + pkgutil -U + +Create a new list of packages to install. Some packages have been renamed and +the package names aren't exactly the same in OpenCSW as in Blastwave. You can +compare the list of packages against a catalog file to figure out which exact +packages you need:: + + cp /var/tmp/before-migration.list /var/tmp/after-migration.list + +Use pkgutil to install the packages from the new list:: + + for pkg in `cat /var/tmp/after-migration.list`; do \ + pkgutil -y -i $pkg; \ + done Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 09:07:31 UTC (rev 23425) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 15:12:48 UTC (rev 23426) @@ -30,8 +30,13 @@ Sparse zone with shared ``/usr`` -------------------------------- -This setup won't work with OpenCSW packages, because the CSWcas-* package -family installs `class action scripts`_ into ``/usr``. +You need to install cswclassutils scripts (CSWcas-*) in the global zone. +Otherwise your setup won't work with OpenCSW packages, because the CSWcas-* +package family installs `class action scripts`_ into /usr. See the +`cswclassutils wants to write in /usr`_ thread for more information. + .. _class action scripts: http://wiki.opencsw.org/cswclassutils-package +.. _cswclassutils wants to write in /usr: + http://lists.opencsw.org/pipermail/maintainers/2009-December/010638.html 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 Apr 18 19:49:48 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Apr 2014 17:49:48 +0000 Subject: SF.net SVN: gar:[23427] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: <3g9Pvq5ftVzQw@mail.opencsw.org> Revision: 23427 http://sourceforge.net/p/gar/code/23427 Author: wahwah Date: 2014-04-18 17:49:46 +0000 (Fri, 18 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Added tips from Laurent Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst csw/mgar/pkg/opencsw-manual/trunk/files/index.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-18 15:12:48 UTC (rev 23426) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-18 17:49:46 UTC (rev 23427) @@ -4,6 +4,8 @@ Getting started --------------- +.. _getting-started: + :: pkgadd -d http://get.opencsw.org/now Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 15:12:48 UTC (rev 23426) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 17:49:46 UTC (rev 23427) @@ -3,7 +3,7 @@ ----------------------- 1. set inherit-pkg-dir on ``/opt/csw`` -2. install packages in the global zone +2. install OpenCSW packages in the global zone When inherited by non-global zones, ``/opt/csw`` is read-only. Two directories that might need local (per-zone) modifications are ``etc`` and ``var``. @@ -12,23 +12,18 @@ Most packages built after July 2010 support local ``var``. +**Keep all your zones running** when installing packages. Otherwise class +action scripts won't have a chance to run and you'll end up with a broken +installation, e.g. missing configuration files. -Local mount hack (unsupported) ------------------------------- +**Create users in advance.** Some packages create users on installation, if +these users don't exist already. Users are created by name, without +controlling what UIDs they get. If you want to keep UIDs of these users +consistent across all zones, create your users in advance. -If you're using a package which wasn't configured to use ``/etc/opt/csw`` -and/or ``/var/opt/csw`` but you still need to have per-zone changes, you can -mount your own, writable ``/opt/csw/etc`` on top of the read only ``/opt/csw``:: - # /etc/vfstab entries - /path/to/your/local/etc - /opt/csw/etc lofs - yes - - /path/to/your/local/var - /opt/csw/var lofs - yes - - -This is only a hack that might help you with a legacy package, it's not a -supported way of using OpenCSW packages. - Sparse zone with shared ``/usr`` --------------------------------- +================================ You need to install cswclassutils scripts (CSWcas-*) in the global zone. @@ -40,3 +35,18 @@ http://wiki.opencsw.org/cswclassutils-package .. _cswclassutils wants to write in /usr: http://lists.opencsw.org/pipermail/maintainers/2009-December/010638.html + + +Local mount hack (unsupported) +============================== + +If you're using a package which wasn't configured to use ``/etc/opt/csw`` +and/or ``/var/opt/csw`` but you still need to have per-zone changes, you can +mount your own, writable ``/opt/csw/etc`` on top of the read only ``/opt/csw``:: + + # /etc/vfstab entries + /path/to/your/local/etc - /opt/csw/etc lofs - yes - + /path/to/your/local/var - /opt/csw/var lofs - yes - + +This is only a hack that might help you with a legacy package, it's not a +supported way of using OpenCSW packages. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/index.rst 2014-04-18 15:12:48 UTC (rev 23426) +++ csw/mgar/pkg/opencsw-manual/trunk/files/index.rst 2014-04-18 17:49:46 UTC (rev 23427) @@ -7,7 +7,7 @@ Welcome to the OpenCSW manual! ============================== -Contents: +First time here? Go to :ref:`getting started `. .. toctree:: :maxdepth: 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 Apr 18 21:50:11 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Apr 2014 19:50:11 +0000 Subject: SF.net SVN: gar:[23428] csw/mgar/pkg/lang-python/fabric/trunk Message-ID: <3g9SZm08rNzjd@mail.opencsw.org> Revision: 23428 http://sourceforge.net/p/gar/code/23428 Author: dmichelsen Date: 2014-04-18 19:50:09 +0000 (Fri, 18 Apr 2014) Log Message: ----------- lang-python/fabric/trunk: Update to 1.8.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/fabric/trunk/Makefile csw/mgar/pkg/lang-python/fabric/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lang-python/fabric/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/fabric/trunk/Makefile 2014-04-18 17:49:46 UTC (rev 23427) +++ csw/mgar/pkg/lang-python/fabric/trunk/Makefile 2014-04-18 19:50:09 UTC (rev 23428) @@ -1,8 +1,8 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = fabric -VERSION = 1.0.1 +NAME = Fabric +VERSION = 1.8.3 GARTYPE = v2 CATEGORIES = python @@ -16,10 +16,22 @@ prompting the running user for input, or aborting execution. endef -MASTER_SITES = http://code.fabfile.org/projects/fabric/files/ -DISTNAME = Fabric-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +VENDOR_URL = http://www.fabfile.org +BUILD_DEP_PKGS += CSWpy-paramiko + +# Skip 2.6 as it fails 'with path' +MODULATIONS_PYTHON_VERSION = 2_7 + +PACKAGES += CSWpy-fabric +ARCHALL_CSWpy-fabric = 1 +# As listed as dependencies +RUNTIME_DEP_PKGS_CSWpy-fabric += CSWpy-paramiko +CHECKPKG_OVERRIDES_CSWpy-fabric += surplus-dependency|CSWpy-paramiko +# Doesn't work on 2.6 +CHECKPKG_OVERRIDES_CSWpy-fabric += python-package-missing-py26-files + include gar/category.mk Modified: csw/mgar/pkg/lang-python/fabric/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/fabric/trunk/checksums 2014-04-18 17:49:46 UTC (rev 23427) +++ csw/mgar/pkg/lang-python/fabric/trunk/checksums 2014-04-18 19:50:09 UTC (rev 23428) @@ -1 +1 @@ -2d8bc8055be51e4fd4247ceac8b79c05 Fabric-1.0.1.tar.gz +02ce0ad4657f2d0ab6497a8fd3a09c2c Fabric-1.8.3.tar.gz Deleted: csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW 2014-04-18 17:49:46 UTC (rev 23427) +++ csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW 2014-04-18 19:50:09 UTC (rev 23428) @@ -1,5 +0,0 @@ -fabric (1.0.1,REV=2011.06.16) - - * Initial release. - - -- Sebastian Kayser Thu, 16 Jun 2011 12:21:04 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 19 01:48:00 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Apr 2014 23:48:00 +0000 Subject: SF.net SVN: gar:[23429] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: <3g9YsL3KsXz12n@mail.opencsw.org> Revision: 23429 http://sourceforge.net/p/gar/code/23429 Author: wahwah Date: 2014-04-18 23:47:59 +0000 (Fri, 18 Apr 2014) Log Message: ----------- /home/maciej/opencsw/opencsw-manual/trunk: Turns out you can create an index. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/faq.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -19,11 +19,11 @@ How can I install CSW packages in a location other than ``/opt/csw``? ===================================================================== -OpenCSW packages are not relocatable, so you can't install them in a location -other than /opt/csw. Even if the packages were relocatable from the package -system point of view, there are usually paths hard-coded within the packaged -applications that point to and rely on /opt/csw (for libraries, configuration -files, data files and such). Relocating such applications is +OpenCSW packages are not :index:`relocatable`, so you can't install them in a +location other than /opt/csw. Even if the packages were relocatable from the +package system point of view, there are usually paths hard-coded within the +packaged applications that point to and rely on /opt/csw (for libraries, +configuration files, data files and such). Relocating such applications is application-specific. How can I transfer packages to a computer without an Internet connection? @@ -32,25 +32,26 @@ Please see :ref:`installing on a host without an Internet connection `. -Why do packages go by two names (e.g. CSWftype2 and freetype2)? +Why do packages go by two names? (e.g. CSWftype2 and freetype2) =============================================================== There are two names associated with every piece of software that we ship: a -package name (a.k.a. pkgname, or pkginst) and a catalog name. The package name -is used by the underlying Solaris SVR4 package management tools (pkgadd, pkgrm, -pkginfo), needs to fit historical limits (32 characters), and is sometimes -cryptically condensed. The catalog name has no significance to Solaris itself, -and is used by pkgutil and in package catalogs. +package name (a.k.a. :index:`pkgname`, or :index:`pkginst`) and a +:index:`catalog name`. The package name is used by the underlying Solaris SVR4 +package management tools (pkgadd, pkgrm, pkginfo), needs to fit historical +limits (32 characters), and is sometimes cryptically condensed. The catalog +name has no significance to Solaris itself, and is used by pkgutil and in +package catalogs. Why not use third party dependencies? ===================================== Problems with declaring SUNW and SFW packages as dependencies are: -* pkgutil can't download and install them, so declaring them as dependencies +* pkgutil can't download and/or install them, so declaring them as dependencies won't help during installation * they often contain old versions of software (or libraries), while OpenCSW - package need newer versions + packages need newer versions * OpenCSW packages must be installable on multiple Solaris versions; a package built for Solaris 9 will also install on Solaris 10. In many cases, the required shared libraries are in packages of different names, e.g. 64-bit @@ -70,8 +71,8 @@ Are the binaries compiled for advanced Instruction Set Architectures? ===================================================================== -Binaries are compiled for basic ISAs. As of April 2014, it means pentium_pro on -Intel and sparcv8+ on SPARC. +Binaries are compiled for basic ISAs. As of April 2014, it means +:index:`pentium_pro` on Intel and :index:`sparcv8+` on SPARC. In most cases, performance is not significantly improved by compiling for advanced ISAs. For those cases where it is, we usually provide cpu-optimized Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -1,11 +1,9 @@ -.. $Id$ +.. _getting-started: --------------- Getting started --------------- -.. _getting-started: - :: pkgadd -d http://get.opencsw.org/now Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -4,7 +4,6 @@ .. _installing-on-a-host-without-an-internet-connection: ---------------------------------------------------- Installing on a host without an Internet connection --------------------------------------------------- @@ -31,12 +30,12 @@ .. _discussed on the community site: http://www.opencsw.org/community/questions/92/installing-without-a-direct-internet-access ------------------ + Large deployments ----------------- -To manage package across multiple hosts, you can use a configuration management -system like puppet, see `Andy Botting's blog post`_ for an example. +1. :ref:`Set up a local mirror`. +2. Manage packages with puppet, see `Andy Botting's blog post`_ for an example. .. _Andy Botting's blog post: http://www.andybotting.com/using-pkgutil-on-solaris-with-puppet-for-easy-package-management Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -1,9 +1,11 @@ .. $Id$ ---------------------------- -Setting up a private mirror ---------------------------- +.. _setting-up-local-mirror: +---------------------------------- +Setting up a :index:`local mirror` +---------------------------------- + Sometimes it is sufficient to simply use a mirror on the Internet. However, there are situations where a local mirror can be useful. When you have a lot of servers accessing the repository, want to control the package updates Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -37,8 +37,8 @@ Do not set LD_LIBRARY_PATH ========================== -LD_LIBRARY_PATH is an environment variable which can be used to make the -dynamic linker look for shared libraries in specific places. It is not +:index:`LD_LIBRARY_PATH` is an environment variable which can be used to make +the dynamic linker look for shared libraries in specific places. It is not necessary to set it for OpenCSW binaries. All of them are built with the ``-R`` flag, so each binary itself knows where to look for the shared objects. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/solaris-10-sparse-zones.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -1,6 +1,6 @@ ------------------------ -Solaris 10 sparse zones ------------------------ +-------------------------------- +Solaris 10 :index:`sparse zones` +-------------------------------- 1. set inherit-pkg-dir on ``/opt/csw`` 2. install OpenCSW packages in the global zone Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -5,9 +5,8 @@ 64-bit binaries aren't always best ---------------------------------- -It's counter-intuitive, but 64-bit binaries are more memory-hungry and -often slower than 32-bit ones. It makes sense to build 64-bit binaries -when: +It's counter-intuitive, but :index:`64-bit` binaries are more memory-hungry and +often slower than 32-bit ones. It makes sense to build 64-bit binaries when: * There's a measurable speed boost. * The application needs to access more than 2G of RAM. @@ -58,8 +57,8 @@ Development packages (header files) ----------------------------------- -Development packages in most cases don't distinguish between 32-bit and -64-bit ? you don't have to do anything. +:index:`Development packages` in most cases don't distinguish between 32-bit +and 64-bit ? you don't have to do anything. However, there are some software projects (e.g. ``gmp``) which install different headers depending on bitness. These have to be handled @@ -136,11 +135,12 @@ BUILD64 = 1 -**See also** +.. seealso:: -* `Solaris 64-bit Developer's Guide`_ -* `Are 64-bit Binaries Really Slower than 32-bit Binaries?`_ + `Solaris 64-bit Developer's Guide`_ + `Are 64-bit Binaries Really Slower than 32-bit Binaries?`_ + .. _Solaris 64-bit Developer's Guide: http://docs.sun.com/app/docs/doc/816-5138 Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -11,9 +11,9 @@ starting from a fresh Solaris 10 install and ends with a built package. It takes about 2-3h to complete. It covers the basic GAR setup. -A build-farm is a set of hosts where you can build Solaris packages. You can -connect Intel and SPARC hosts together to build a set of packages with one -shell command. +A :index:`buildfarm` is a set of hosts where you can build Solaris packages. +You can connect Intel and SPARC hosts together to build a set of packages with +one shell command. There is a few separate parts which you can set up (in no particular order): Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -1,3 +1,5 @@ +.. _building-a-catalog: + -------------------------- Building a package catalog -------------------------- Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -23,8 +23,8 @@ there's a source package available. In that case extra fields should be added to the end so not to break existing tools. -Signatures -========== +GPG Signatures +============== A catalog file can be signed with gpg, cleartext style, with the signature embedded in the file. @@ -36,9 +36,10 @@ # CREATIONDATE 2014-03-16T08:39:58Z -See also: +.. seealso:: -* `Building a catalog`_ + `Building a catalog`_ + Information on how to build your own catalog. .. _Building a catalog: - building-a-catalog.html + building-a-catalog.html Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-releases.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -9,12 +9,12 @@ also see the README file on the OpenCSW master mirror [#opencsw-master-mirror]_. -* **unstable** is a working catalog where package maintainers make changes at +* **:index:`unstable`** is a working catalog where package maintainers make changes at will. Updates to unstable are pushed every 10 minutes (April 2014). * **testing** is a symlink to a named release. It gets periodically updated from the unstable catalog. As of March 2014, it is done infrequently, by a human. -* **stable** is a symlink to a named release. Once a stable release is made, it +* **:index:`stable`** is a symlink to a named release. Once a stable release is made, it is not updated unless there are important security updates to be pushed. References Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -22,7 +22,7 @@ local state needs to be kept under ``/var/opt/csw``. Inside the ``/opt/csw`` prefix, the typical hierarchy rules apply. You can -consult the Debian `filesystem hierarchy standard`_ for an overview. A short version is: +consult the `Debian filesystem hierarchy standard`_ for an overview. A short version is: * Executables go to ``/opt/csw/bin`` ``/opt/csw/sbin`` ``/opt/csw/libexec`` * Shared libraries go to ``/opt/csw/lib`` @@ -43,5 +43,5 @@ .. _Shared /opt/csw configuration files: http://wiki.opencsw.org/shared-opt-csw-setup -.. _filesystem hierarchy standard: +.. _Debian filesystem hierarchy standard: http://wiki.debian.org/FilesystemHierarchyStandard Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -13,13 +13,12 @@ pkgname vs catalogname ---------------------- -pkgname is also known as pkginst. It's a name of a package in the Solaris -packaging system. These package names start with the company ticker (e.g. -SUNW). OpenCSW package start with ?CSW?. +:index:`pkgname` is also known as :index:`pkginst`. It's a name of a package in +the Solaris packaging system. These package names start with the company ticker +(e.g. SUNW). OpenCSW package start with ?CSW?. Catalognames are names used in the catalog index. This means that one package -has two names, for example ?CSWfoo? (pkgname) and ?foo? -(catalogname). +has two names, for example "CSWfoo" (pkgname) and "foo" (:index:`catalogname`). Applications and named projects ------------------------------- Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst 2014-04-18 19:50:09 UTC (rev 23428) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst 2014-04-18 23:47:59 UTC (rev 23429) @@ -11,7 +11,7 @@ Life cycle of a shared library can be summarized in the following way: -1. A SONAME appears +1. A :index:`SONAME` appears 2. We decide to distribute it 3. Binaries start linking to it 4. Time passes, new version of the same library comes along This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 19 12:33:25 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 19 Apr 2014 10:33:25 +0000 Subject: SF.net SVN: gar:[23430] csw/mgar/pkg/lang-python Message-ID: <3g9r9z3pDYzl@mail.opencsw.org> Revision: 23430 http://sourceforge.net/p/gar/code/23430 Author: wahwah Date: 2014-04-19 10:33:23 +0000 (Sat, 19 Apr 2014) Log Message: ----------- futures: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/futures/trunk/Makefile csw/mgar/pkg/lang-python/futures/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/futures/ Modified: csw/mgar/pkg/lang-python/futures/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mock/trunk/Makefile 2014-03-25 00:03:42 UTC (rev 23275) +++ csw/mgar/pkg/lang-python/futures/trunk/Makefile 2014-04-19 10:33:23 UTC (rev 23430) @@ -2,14 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = mock -VERSION = 1.0.1 +NAME = futures +VERSION = 2.1.6 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = A Python Mocking and Patching Library for Testing +DESCRIPTION = Backport of the concurrent.futures package from Python 3.2 DISTFILES = $(DISTNAME).tar.gz -VENDOR_URL = https://pypi.python.org/pypi/mock/1.0.1 +VENDOR_URL = http://code.google.com/p/pythonfutures ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/futures/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mock/trunk/checksums 2014-03-25 00:03:42 UTC (rev 23275) +++ csw/mgar/pkg/lang-python/futures/trunk/checksums 2014-04-19 10:33:23 UTC (rev 23430) @@ -1 +1 @@ -c3971991738caa55ec7c356bbc154ee2 mock-1.0.1.tar.gz +cfab9ac3cd55d6c7ddd0546a9f22f453 futures-2.1.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Apr 19 14:52:00 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 19 Apr 2014 12:52:00 +0000 Subject: SF.net SVN: gar:[23431] csw/mgar/pkg/nmap/trunk Message-ID: <3g9vH56yZCz9l@mail.opencsw.org> Revision: 23431 http://sourceforge.net/p/gar/code/23431 Author: guengel Date: 2014-04-19 12:51:55 +0000 (Sat, 19 Apr 2014) Log Message: ----------- nmap/trunk: Bumped to nmap 6.45. Modified Paths: -------------- csw/mgar/pkg/nmap/trunk/Makefile csw/mgar/pkg/nmap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nmap/trunk/files/0000-Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch csw/mgar/pkg/nmap/trunk/files/0000-Add-vasprintf-compatibility.patch csw/mgar/pkg/nmap/trunk/files/asprintf.c csw/mgar/pkg/nmap/trunk/files/file.h csw/mgar/pkg/nmap/trunk/files/tasprintf.c csw/mgar/pkg/nmap/trunk/files/vasprintf.c Removed Paths: ------------- csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch csw/mgar/pkg/nmap/trunk/files/collatingsvn.patch Modified: csw/mgar/pkg/nmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmap/trunk/Makefile 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/Makefile 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,6 +1,7 @@ NAME = nmap -VERSION = 6.01 +VERSION = 6.45 GARTYPE = v2 +GARCOMPILER = GCC4 DESCRIPTION = A network exploration tool and security/port scanner define BLURB @@ -15,12 +16,17 @@ endef MASTER_SITES = http://nmap.org/dist/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +# Those files are taken from FreeBSD 10.0 and stripped off some #ifdef WHATEVER where necessary. +DISTFILES += file.h asprintf.c vasprintf.c +PATCHFILES += 0000-Add-vasprintf-compatibility.patch +PATCHFILES += 0000-Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch BUILD_DEP_PKGS += CSWlibpcre-dev BUILD_DEP_PKGS += CSWlibpcap-dev BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibasprintf0 PACKAGES += CSWnmap SPKG_DESC_CSWnmap = A network exploration tool and security/port scanner @@ -29,35 +35,25 @@ RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1 RUNTIME_DEP_PKGS_CSWnmap += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWnmap += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSWnmap += CSWlua +RUNTIME_DEP_PKGS_CSWnmap += CSWlua RUNTIME_DEP_PKGS_CSWnmap += CSWpython -# For Zenmap -#RUNTIME_DEP_PKGS_CSWnmap += CSWpygtk - # Tons of docs and identification of programs installed there CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content -# The Python module is really embedded here, that is ok -CHECKPKG_OVERRIDES_CSWnmap += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWnmap += catalogname-does-not-start-with-py_ - -#PACKAGES += CSWzenmap +PACKAGES += CSWzenmap SPKG_DESC_CSWzenmap = zenmap PKGFILES_CSWzenmap += $(bindir)/zenmap -PKGFILES_CSWzenmap += $(libdir)/python/.* +PKGFILES_CSWzenmap += $(bindir)/nmapfe +PKGFILES_CSWzenmap += $(bindir)/xnmap +PKGFILES_CSWzenmap += $(libdir)/python.* PKGFILES_CSWzenmap += $(mandir)/.*/zenmap\.1 PKGFILES_CSWzenmap += $(sharedstatedir)/zenmap/.* +# For Zenmap +RUNTIME_DEP_PKGS_CSWzenmap += CSWnmap +RUNTIME_DEP_PKGS_CSWzenmap += CSWpy-gtk +RUNTIME_DEP_PKGS_CSWzenmap += CSWpy-gobject - -PATCHFILES = 0001-Fix-IFF_IPMP-compilation-bug.patch - -# See standards(5) for details -# we disable this (for) now, because we're switching the compiler to GCC4 -#EXTRA_CPPFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ -#EXTRA_CXXFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ -#EXTRA_CXXFLAGS += -library=stlport4 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libpcre=$(prefix) CONFIGURE_ARGS += --with-libpcap=$(prefix) @@ -69,13 +65,8 @@ # http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS CONFIGURE_ARGS += --with-libdnet=included -#CONFIGURE_ARGS += --with-liblua=$(prefix) -CONFIGURE_ARGS += --without-liblua +CONFIGURE_ARGS += --with-liblua=$(prefix) -# Not necessary -# CONFIGURE_ARGS += --with-libnbase= -# CONFIGURE_ARGS += --with-libnsock= - # There is no testsuite TEST_SCRIPTS = @@ -84,10 +75,10 @@ EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/uninstall_zenmap EXTRA_PAX_ARGS += -s ',/ndiff,/nmap-ndiff,' - -GARCOMPILER = GCC4 - include gar/category.mk -#post-extract-modulated: -# -cd $(WORKSRC) && find . -type d | while read d; do touch $$d/makefile.dep; done +pre-configure: + ginstall $(WORKDIR)/asprintf.c $(WORKSRC)/nsock/src + ginstall $(WORKDIR)/vasprintf.c $(WORKSRC)/nsock/src + ginstall $(WORKDIR)/file.h $(WORKSRC)/nsock/src + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nmap/trunk/checksums =================================================================== --- csw/mgar/pkg/nmap/trunk/checksums 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/checksums 2014-04-19 12:51:55 UTC (rev 23431) @@ -1 +1 @@ -a1a71940f238abb835dbf3ee7412bcea nmap-6.01.tar.bz2 +e8c337456a692bada3ee53e7f5b87bac nmap-6.45.tar.bz2 Added: csw/mgar/pkg/nmap/trunk/files/0000-Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0000-Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch (rev 0) +++ csw/mgar/pkg/nmap/trunk/files/0000-Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -0,0 +1,24 @@ +From 9882b4f695da2b8d30fe7858e5e5794e7ba86183 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 19 Apr 2014 14:17:33 +0200 +Subject: [PATCH] Add python2.6/site-packages/gtk-2.0 to python path in zenmap. + +--- + zenmap/zenmap | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/zenmap/zenmap b/zenmap/zenmap +index 13b676b..c3767eb 100755 +--- a/zenmap/zenmap ++++ b/zenmap/zenmap +@@ -164,6 +164,7 @@ def is_secure_dir(path, num_symlinks=0): + + return True + ++sys.path.append('/opt/csw/lib/python2.6/site-packages/gtk-2.0') + # Add the install_lib directory to sys.path, the list of directories searched + # for modules, but don't do it if the directory or its parents may be writable + # by other users. The following line is replaced by the installation program. +-- +1.8.4.1 + Added: csw/mgar/pkg/nmap/trunk/files/0000-Add-vasprintf-compatibility.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0000-Add-vasprintf-compatibility.patch (rev 0) +++ csw/mgar/pkg/nmap/trunk/files/0000-Add-vasprintf-compatibility.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -0,0 +1,34 @@ +From dcbfe9dd12107e6cce8bd2fc8a121670be879eec Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 19 Apr 2014 12:07:20 +0200 +Subject: [PATCH] Add vasprintf() compatibility + +--- + nsock/src/Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/nsock/src/Makefile.in b/nsock/src/Makefile.in +index 7e7668f..e7d66ca 100644 +--- a/nsock/src/Makefile.in ++++ b/nsock/src/Makefile.in +@@ -32,13 +32,15 @@ SRCS = error.c filespace.c gh_heap.c nsock_connect.c nsock_core.c \ + nsock_iod.c nsock_read.c nsock_timers.c nsock_write.c \ + nsock_ssl.c nsock_event.c nsock_pool.c netutils.c nsock_pcap.c \ + nsock_engines.c engine_select.c engine_epoll.c engine_kqueue.c \ +- engine_poll.c nsock_proxy.c nsock_log.c proxy_http.c proxy_socks4.c ++ engine_poll.c nsock_proxy.c nsock_log.c proxy_http.c proxy_socks4.c \ ++ vasprintf.c asprintf.c + + OBJS = error.o filespace.o gh_heap.o nsock_connect.o nsock_core.o \ + nsock_iod.o nsock_read.o nsock_timers.o nsock_write.o \ + nsock_ssl.o nsock_event.o nsock_pool.o netutils.o nsock_pcap.o \ + nsock_engines.o engine_select.o engine_epoll.o engine_kqueue.o \ +- engine_poll.o nsock_proxy.o nsock_log.o proxy_http.o proxy_socks4.o ++ engine_poll.o nsock_proxy.o nsock_log.o proxy_http.o proxy_socks4.o \ ++ vasprintf.o asprintf.o + + DEPS = error.h filespace.h gh_list.h nsock_internal.h netutils.h nsock_pcap.h \ + nsock_log.h nsock_proxy.h gh_heap.h ../include/nsock.h \ +-- +1.8.4.1 + Deleted: csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,24 +0,0 @@ -From a93f6c299e460dd381c3459aa4dad61d9e2b213b Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 23 Aug 2011 13:35:57 +0200 -Subject: [PATCH 1/2] Add definition for INT_MAX - ---- - ncat/ncat_listen.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c -index 82d7d67..d0fe6f6 100644 ---- a/ncat/ncat_listen.c -+++ b/ncat/ncat_listen.c -@@ -96,6 +96,7 @@ - #include - #include - #include -+#include - #ifndef WIN32 - #include - #include --- -1.7.6 - Deleted: csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,28 +0,0 @@ -From 2c44837792045bd96917bbd6f8a664afc655c270 Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Sat, 6 Apr 2013 22:09:45 +0200 -Subject: [PATCH] Fix IFF_IPMP compilation bug - ---- - libdnet-stripped/src/intf.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libdnet-stripped/src/intf.c b/libdnet-stripped/src/intf.c -index 25ae999..865e500 100644 ---- a/libdnet-stripped/src/intf.c -+++ b/libdnet-stripped/src/intf.c -@@ -954,9 +954,11 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) - ; - else - return (-1); -+#ifdef IFF_IPMP - if (lifr->lifr_flags & IFF_IPMP) { - continue; - } -+#endif - - if (_intf_get_noalias(intf, entry) < 0) - return (-1); --- -1.8.1.4 - Deleted: csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,40 +0,0 @@ -From aa4410cb0368057455629d0e1adfa73e25662eb5 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 23 Aug 2011 13:36:17 +0200 -Subject: [PATCH 2/2] Add definitions for CMSG_ALIGN, CMSG_SPACE and CMSG_LEN - ---- - libnetutil/netutil.cc | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc -index ded7550..56ed36d 100644 ---- a/libnetutil/netutil.cc -+++ b/libnetutil/netutil.cc -@@ -111,6 +111,23 @@ - #endif - #include - -+#ifndef CMSG_ALIGN -+# if defined(__sun) || defined(__sun__) -+# define CMSG_ALIGN _CMSG_DATA_ALIGN -+# else -+# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1)) -+# endif -+#endif -+ -+#ifndef CMSG_SPACE -+# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len)) -+#endif -+ -+#ifndef CMSG_LEN -+# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len)) -+#endif -+ -+ - #if HAVE_NETINET_IN_H - #include - #endif --- -1.7.6 - Deleted: csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,24 +0,0 @@ -From ef6e71ddbd2a264500c997c3bd64a3e6d92bdd3e Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 23 Aug 2011 17:32:18 +0200 -Subject: [PATCH] Do not use __attribute__ - ---- - nmap_error.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/nmap_error.h b/nmap_error.h -index 356dd8c..9313f5e 100644 ---- a/nmap_error.h -+++ b/nmap_error.h -@@ -124,6 +124,7 @@ extern "C" { - #ifdef WIN32 - __declspec(noreturn) - #endif -+#define __attribute__(x) - void fatal(const char *fmt, ...) - __attribute__ ((noreturn)) - __attribute__ ((format (printf, 1, 2))); --- -1.7.6 - Deleted: csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,26 +0,0 @@ -From bd9b0814c81cda23e49293e9471417753e97fa1c Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 24 Aug 2011 15:32:51 +0200 -Subject: [PATCH] Make lt_sockaddr_storage::operator const or compiler bails - out - ---- - traceroute.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/traceroute.cc b/traceroute.cc -index b972828..dec5353 100644 ---- a/traceroute.cc -+++ b/traceroute.cc -@@ -1338,7 +1338,7 @@ void TracerouteState::remove_finished_hosts() { - - /* Dummy class to use sockaddr_storage as a map key. */ - struct lt_sockaddr_storage { -- bool operator()(const struct sockaddr_storage& a, const struct sockaddr_storage& b) { -+ bool operator()(const struct sockaddr_storage& a, const struct sockaddr_storage& b) const { - return sockaddr_storage_cmp(&a, &b) < 0; - } - }; --- -1.7.5.4 - Deleted: csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,25 +0,0 @@ -From f5d0f3a8fc5376b0fe0aedb7863ec77b0d6173b0 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 24 Aug 2011 17:04:41 +0200 -Subject: [PATCH] Fix const definition of route_dst or c++ linkage fails - ---- - libnetutil/netutil.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc -index 56ed36d..211d275 100644 ---- a/libnetutil/netutil.cc -+++ b/libnetutil/netutil.cc -@@ -3217,7 +3217,7 @@ static int route_dst_generic(const struct sockaddr_storage *dst, - * Even if spoofss is NULL, if user specified a network device with -e, - * it should still be passed. Note that it's OK to pass either NULL or - * an empty string as the "device", as long as spoofss==NULL. */ --int route_dst(const struct sockaddr_storage *dst, struct route_nfo *rnfo, -+int route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo, - const char *device, const struct sockaddr_storage *spoofss) { - #ifdef HAVE_LINUX_RTNETLINK_H - return route_dst_netlink(dst, rnfo, device, spoofss); --- -1.7.5.4 - Deleted: csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch =================================================================== --- csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch 2014-04-19 10:33:23 UTC (rev 23430) +++ csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch 2014-04-19 12:51:55 UTC (rev 23431) @@ -1,285 +0,0 @@ -From 5bccd8398c9e9467eb759af4c723b03c36123113 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 25 Aug 2011 15:39:28 +0200 -Subject: [PATCH] Forward-port of collatingsvn.patch - ---- - nmap-service-probes | 94 +++++++++++++++++++++++++------------------------- - 1 files changed, 47 insertions(+), 47 deletions(-) - -diff --git a/nmap-service-probes b/nmap-service-probes -index 4fe8b9e..2a30f30 100644 ---- a/nmap-service-probes -+++ b/nmap-service-probes -@@ -115,7 +115,7 @@ match backdoor m|^220 SSL Connection Established - Loading Protocol\.\.\.\.\r\n| - match backdoor m|^A-311 Death welcome\x001| p/Haxdoor trojan/ i/**BACKDOOR**/ o/Windows/ - match backdoor m|^220 CAFEiNi [-\w_.]+ FTP server\r\n$| p/CAFEiNi trojan/ i/**BACKDOOR**/ o/Windows/ - match backdoor m/^220 (Stny|fuck)Ftpd 0wns j0\r?\n/ p/Kibuv.b worm/ i/**BACKDOOR**/ o/Windows/ --match backdoor m|^220 [Sf.][tu.][nc.][yk.][.F][t.][p.][d.] [0.][w.][n.][s.] [j.][0.]\r?\n|i p/Generic Kibuv worm/ i/**BACKDOOR**/ o/Windows/ -+match backdoor m|^220 [Sf.][tu.][nc.][yk.][F.][t.][p.][d.] [0.][w.][n.][s.] [j.][0.]\r?\n|i p/Generic Kibuv worm/ i/**BACKDOOR**/ o/Windows/ - match backdoor m=^(?:ba|)sh-([\d.]+)\$ = p/Bourne shell/ i/**BACKDOOR**/ v/$1/ - match backdoor m=^exec .* failed : No such file or directory\n$= p/netcat -e/ i/misconfigured/ - match backdoor m=220-Welcome!\r\n220-\x1b\[30m/\x1b\[31m#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4# \r\n220-\x1b\[30m\| Current Time: \x1b\[35m[^\r\n]*\r\n220-\x1b\[30m\| Current Date: \x1b\[35m[^\r\n]*\r\n220-\x1b\[30m\\\r\n= p/Windows trojan/ i/**BACKDOOR**/ o/Windows/ -@@ -518,7 +518,7 @@ match ftp m|^220 ([-.\w]+) FTP server \(Version ([-.\w]+)/OpenBSD\) ready\.\r\n$ - match ftp m|^220 ([-.\w]+) FTP server \(Version (6.0\w+)\) ready.\r\n| p/FreeBSD ftpd/ h/$1/ v/$2/ o/FreeBSD/ - match ftp m|^220 FTP server \(Version ([\w.]+)\) ready\.\r\n| p/FreeBSD ftpd/ v/$1/ o/FreeBSD/ - # Trolltech Troll-FTPD 1.28 (Only runs on Linux) --match ftp m|^220-Setting memory limit to 1024\+1024kbytes\r\n220-Local time is now \d+:\d+ and the load is [.\d]+\.\r\n220 You will be disconnected after \d+ seconds of inactivity.\r\n$| p/Trolltech Troll-FTPd/ o/Linux/ -+match ftp m|^220-Setting memory limit to 1024\+1024kbytes\r\n220-Local time is now \d+:\d+ and the load is [\d.]+\.\r\n220 You will be disconnected after \d+ seconds of inactivity.\r\n$| p/Trolltech Troll-FTPd/ o/Linux/ - - match ftp m|^220 FTP server \(Hummingbird Ltd\. \(HCLFTPD\) Version (7.1.0.0)\) ready\.\r\n$| p/Hummingbird FTP server/ v/$1/ - match ftp m|^220 FTP server \(Hummingbird Communications Ltd\. \(HCLFTPD\) Version ([\d.]+)\) ready\.\r\n| p/Hummingbird FTP server/ v/$1/ -@@ -538,7 +538,7 @@ match ftp m|^220-\r\n220 ([-.\w]+) FTP server \(NetBSD-ftpd ([-.\w]+)\) ready.\r - match ftp m|^220 ([-.\w]+) Network Management Card AOS v([-.\w]+) FTP server ready.\r\n$| p/APC AOS ftpd/ v/$2/ i/on APC $1 network management card/ d/power-device/ o/AOS/ - match ftp m|^220 FTP Server \(Version 1.0\) ready.\r\n$| p/GlobespanVirata ftpd/ v/1.0/ d/broadband router/ - # HP-UX B.11.00 --match ftp m|^220 ([-.\w ]+) FTP server \(Version (1.1.2[.\d]+) [A-Z][a-z]{2} [A-Z][a-z]{2} .*\) ready.\r\n| p/HP-UX ftpd/ h/$1/ v/$2/ o/HP-UX/ -+match ftp m|^220 ([-.\w ]+) FTP server \(Version (1.1.2[\d.]+) [A-Z][a-z]{2} [A-Z][a-z]{2} .*\) ready.\r\n| p/HP-UX ftpd/ h/$1/ v/$2/ o/HP-UX/ - # 220 mirrors.midco.net FTP server ready. - # WarFTP Daemon 1.70 on Win2K - match ftp m=^220-.*\r\n(220-|) WarFTPd (\d[-.\w]+) \([\w ]+\) Ready\r\n=s p/WarFTPd/ v/$2/ -@@ -703,7 +703,7 @@ match ftp m|^220 Golden FTP Server ready v([\d.]+)\r\n| p/Golden ftpd/ v/$1/ o/W - match ftp m|^220 Golden FTP Server PRO ready v([\d.]+)\r\n| p/Golden PRO ftpd/ v/$1/ o/Windows/ - match ftp m|^220 ITC Version ([\d.]+) of [-\d]+ X Kyocera UIO UMC 10base OK \r\n| p/X Kyocera UIO UMC 10base print server ftpd/ v/$1/ d/print server/ - match ftp m|^220 ActiveFax Version ([\d.]+) \(Build (\d+)\) - .*\r\n| p/ActiveFax ftpd/ v/$1 build $2/ --match ftp m|^220-Welcome to CrushFTP!\r\n220 CrushFTP Server Ready[.!]\r\n| p/CrushFTPd/ -+match ftp m|^220-Welcome to CrushFTP!\r\n220 CrushFTP Server Ready[!.]\r\n| p/CrushFTPd/ - match ftp m|^220-Welcome to CrushFTP([\w._-]+)!\r\n220 CrushFTP Server Ready\.\r\n| p/CrushFTP/ v/$1/ - match ftp m|^220 DPO-7300 FTP Server ([\d.]+) ready\.\n| p/NetSilicon DPO-7300 ftpd/ v/$1/ - match ftp m|^220 Welcome to WinFtp Server\.\r\n| p/WinFtpd/ o/Windows/ -@@ -1048,7 +1048,7 @@ match http m|^HTTP/1\.0 400 Bad Request\r\nServer: OfficeScan Client\r\nContent- - - match http-proxy m=^HTTP/1\.[01] \d\d\d .*\r\n(Server|Proxy-agent): iPlanet-Web-Proxy-Server/([\d.]+)\r\n=s p/iPlanet web proxy/ v/$2/ - --match hp-gsg m|^220 JetDirect GGW server \(version (\d[.\d]+)\) ready\r\n| p/HP JetDirect Generic Scan Gateway/ v/$1/ d/printer/ -+match hp-gsg m|^220 JetDirect GGW server \(version (\d[\d.]+)\) ready\r\n| p/HP JetDirect Generic Scan Gateway/ v/$1/ d/printer/ - match hp-gsg m|^220 HP GGW server \(version ([\w._-]+)\) ready\r\n\0| p/HP Generic Scan Gateway/ v/$1/ d/printer/ - - # http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=bpj01014 -@@ -1546,7 +1546,7 @@ match nntp m|^200 NNTP Service 5\.00\.0984 Version: (5\.0\.2159.1) Posting Allow - match nntp m|^200 NNTP Service Microsoft\xae Internet Services (\d[-.\w]+) Version: (\d[-.\w]+) Posting Allowed \r\n| p/Microsoft NNTP Service $1/ v/$2/ i/posting OK/ o/Windows/ - match nntp m|^502 Connection refused\r\n| p/Microsoft NNTP Service/ i/refused/ o/Windows/ - # Windows NT 4.0 SP5-SP6 --match nntp m|^20[01] Microsoft Exchange Internet News Service Version (\d\.\d\.[.\d]+) \((.*)\)\r\n| p/Microsoft Exchange Internet News Service/ v/$1/ i/$2/ o/Windows/ -+match nntp m|^20[01] Microsoft Exchange Internet News Service Version (\d\.\d\.[\d.]+) \((.*)\)\r\n| p/Microsoft Exchange Internet News Service/ v/$1/ i/$2/ o/Windows/ - match nntp m|^20. ([-.\w]+) InterNetNews NNRP server INN (\d[-.\w ]+) ready \(posting ok\)\.\r\n| p/InterNetNews (INN)/ h/$1/ v/$2/ i/posting ok/ - match nntp m|^20. ([-.\w]+) InterNetNews NNRP server INN (\d[-.\w ]+) ready \(no posting\)\.\r\n| p/InterNetNews (INN)/ h/$1/ v/$2/ i/no posting/ - match nntp m|^200 ArGoSoft News Server for WinNT/2000/XP v ([\d.]+) ready\r\n| p/ArGoSoft nntpd/ v/$1/ o/Windows/ -@@ -2151,7 +2151,7 @@ match smtp m/^220[- ].*\r\n220[- ]([^\r\n]+) ESMTP Exim /s p/Exim smtpd/ h/$1/ - match smtp m/^220 CheckPoint FireWall-1 secure ESMTP server\r\n$/ p/Checkpoint FireWall-1 smtpd/ d/firewall/ - match smtp m/^220 CheckPoint FireWall-1 secure SMTP server\r\n$/ p/Checkpoint FireWall-1 smtpd/ d/firewall/ - match smtp m|^220 ([-.+\w]+) running IBM AS/400 SMTP V([\w]+)| p|IBM AS/400 smtpd| h|$1| v|$2| --match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: (\d[.\w]+)- ready at | p/MailEnable smptd/ h/$1/ v/$2/ o/Windows/ -+match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: (\d[\w.]+)- ready at | p/MailEnable smptd/ h/$1/ v/$2/ o/Windows/ - match smtp m/^220 ([-.+\w]+) ESMTP Mail Enable SMTP Service, Version: (\d[\w.]+)-- ready at/ p/MailEnable smptd/ h/$1/ v/$2/ o/Windows/ - # Enterprise version number seems to be preceeded by "0--"; Professional with "0-" - match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: \d+--([\d.]+) ready at| p/MailEnable Enterprise smptd/ h/$1/ v/$2/ o/Windows/ -@@ -2464,8 +2464,8 @@ match sourceviewerserver m|^OK SourceViewerService v1\.0\r\n| p/NetBeans Source - # http://udk.openoffice.org/common/man/spec/urp.html - match urp m|^\0\0\0\x60\0\0\0\x01\xf8\x04\x96\0\0'com\.sun\.star\.bridge\.XProtocolProperties\x15UrpProtocolProperties\0\0\x14\r\0\0\0\x85\xfbc\x80\x9e\xca@\$\xbc\xc7\x9e\xbb#\x0f\xfc\xd6\0\0\x92\]\xe4\xb8$| p/UNO Remote Protocol (URP)/ - --match sourceoffice m|^200\r\nProtocol-Version:(\d[.\d]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\n\r\n(\w:\\.*ini)\r\n\r\n| p/Sourcegear SourceOffSite/ i/Protocol $1; INI file: $2/ --match sourceoffice m|^250\r\nProtocol-Version:(\d[.\d]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\nKey Length:(\d+)\r\n\r\n.*(\w:\\.*ini)\r\n\r\n|s p/Sourcegear SourceOffSite/ i/Protocol $1; Key len: $2; INI file: $3/ -+match sourceoffice m|^200\r\nProtocol-Version:(\d[\d.]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\n\r\n(\w:\\.*ini)\r\n\r\n| p/Sourcegear SourceOffSite/ i/Protocol $1; INI file: $2/ -+match sourceoffice m|^250\r\nProtocol-Version:(\d[\d.]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\nKey Length:(\d+)\r\n\r\n.*(\w:\\.*ini)\r\n\r\n|s p/Sourcegear SourceOffSite/ i/Protocol $1; Key len: $2; INI file: $3/ - - match spmd m|^SPMD_ACK\0\0\x01\0\x01$| p/Softimage XSI SPMD license server/ o/Windows/ - -@@ -2477,14 +2477,14 @@ match ssh m|^SSH-([\d.]+)-ReflectionForSecureIT_([-\w_.]+) - Process Software Mu - match ssh m|^SSH-([\d.]+)-ReflectionForSecureIT_([-\w_.]+)\r?\n| p/WRQ Reflection for Secure IT sshd/ v/$2/ i/protocol $1/ - - # SCS --match ssh m|^SSH-(\d[.\d]+)-SSH Protocol Compatible Server SCS (\d[-.\w]+)\r?\n| p/SCS NetScreen sshd/ v/$2/ i/protocol $1/ -+match ssh m|^SSH-(\d[\d.]+)-SSH Protocol Compatible Server SCS (\d[-.\w]+)\r?\n| p/SCS NetScreen sshd/ v/$2/ i/protocol $1/ - match ssh m|^SSH-([\d.]+)-SSH Compatible Server\r?\n| p/SCS NetScreen sshd/ i/protocol $1/ - match ssh m|^SSH-([\d.]+)-([\d.]+) SSH Secure Shell Tru64 UNIX\r?\n| p/SCS sshd/ v/$2/ i/protocol $1/ o/Tru64 UNIX/ --match ssh m/^SSH-([.\d]+)-(\d+\.\d+\.\d+) SSH Secure Shell/ p/SCS sshd/ v/$2/ i/protocol $1/ --match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) on ([-.\w]+)\nSSH-(\d[.\d]+)-| p/SCS SSH Secure Shell/ v/$1/ i/on $2; protocol $3/ --match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) \(([^\r\n\)]+)\) on ([-.\w]+)\nSSH-(\d[.\d]+)-| p/SCS sshd/ v/$1/ i/$2; on $3; protocol $4/ -+match ssh m/^SSH-([\d.]+)-(\d+\.\d+\.\d+) SSH Secure Shell/ p/SCS sshd/ v/$2/ i/protocol $1/ -+match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) on ([-.\w]+)\nSSH-(\d[\d.]+)-| p/SCS SSH Secure Shell/ v/$1/ i/on $2; protocol $3/ -+match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) \(([^\r\n\)]+)\) on ([-.\w]+)\nSSH-(\d[\d.]+)-| p/SCS sshd/ v/$1/ i/$2; on $3; protocol $4/ - match ssh m|^sshd2\[\d+\]: .*\r\nSSH-(\d[\d.]+)-(\d[-.\w]+) SSH Secure Shell \(([^\r\n\)]+)\)\r?\n| p/SCS sshd/ v/$2/ i/protocol $1/ --match ssh m/^SSH-([.\d]+)-(\d+\.\d+\.[-.\w]+)/ p/SCS sshd/ v/$2/ i/protocol $1/ -+match ssh m/^SSH-([\d.]+)-(\d+\.\d+\.[-.\w]+)/ p/SCS sshd/ v/$2/ i/protocol $1/ - - # OpenSSH - match ssh m|^SSH-([\d.]+)-OpenSSH_([\w._-]+) Debian-(\S*maemo\S*)\r?\n| p/OpenSSH/ v/$2 Debian $1/ i/Nokia Maemo tablet; protocol $1/ o/Linux/ -@@ -2518,9 +2518,9 @@ match ssh m|^SSH-([\d.]+)-OpenSSH_([-\w_.]+) NCSA_GSSAPI_GPT_([-\w_.]+) GSI\n| p - - # Choose 1 of the following: - # 1) Match all OpenSSHs: --#match ssh m/^SSH-([.\d]+)-OpenSSH[_-]([\S ]+)/i p/OpenSSH/ v/$2/ i/protocol $1/ -+#match ssh m/^SSH-([\d.]+)-OpenSSH[_-]([\S ]+)/i p/OpenSSH/ v/$2/ i/protocol $1/ - # 2) Don't match unknown SSHs (and generate fingerprints) --match ssh m/^SSH-([.\d]+)-OpenSSH[_-]([\w.]+)\r?\n/i p/OpenSSH/ v/$2/ i/protocol $1/ -+match ssh m/^SSH-([\d.]+)-OpenSSH[_-]([\w.]+)\r?\n/i p/OpenSSH/ v/$2/ i/protocol $1/ - - # These are strange ones. These routers pretend to be OpenSSH, but don't do it that well (see the \r): - match ssh m|^SSH-2\.0-OpenSSH\r?\n| p/Linksys WRT45G modified dropbear sshd/ i/protocol 2.0/ d/router/ -@@ -2530,31 +2530,31 @@ match ssh m|^\0\0\0\$\0\0\0\0\x01\0\0\0\x1bNo host key is configured!\n\r!\"v| p - match ssh m|^SSH-(\d[\d.]+)-SSF-(\d[-.\w]+)\r?\n| p/SSF French SSH/ v/$2/ i/protocol $1/ - match ssh m|^SSH-(\d[\d.]+)-lshd_(\d[-.\w]+) lsh - a free ssh\r\n\0\0| p/lshd secure shell/ v/$2/ i/protocol $1/ - match ssh m|^SSH-(\d[\d.]+)-lshd-(\d[-.\w]+) lsh - a GNU ssh\r\n\0\0| p/lshd secure shell/ v/$2/ i/protocol $1/ --match ssh m/^SSH-([.\d]+)-Sun_SSH_(\S+)/ p/SunSSH/ v/$2/ i/protocol $1/ --match ssh m/^SSH-([.\d]+)-meow roototkt by rebel/ p/meow SSH ROOTKIT/ i/protocol $1/ -+match ssh m/^SSH-([\d.]+)-Sun_SSH_(\S+)/ p/SunSSH/ v/$2/ i/protocol $1/ -+match ssh m/^SSH-([\d.]+)-meow roototkt by rebel/ p/meow SSH ROOTKIT/ i/protocol $1/ - # Akamai hosted systems tend to run this - found on www.microsoft.com --match ssh m|^SSH-(\d[.\d]*)-(AKAMAI-I*)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/ --match ssh m|^SSH-(\d[.\d]*)-(Server-V)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/ --match ssh m|^SSH-(\d[.\d]*)-(Server-VI)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/ --match ssh m|^SSH-(\d[.\d]*)-(Server-VII)\r?\n| p/Akamai SSH/ v/$2/ i/protocol $1/ --match ssh m|^SSH-(\d[.\d]+)-Cisco-(\d[.\d]+)\r?\n$| p/Cisco SSH/ v/$2/ i/protocol $1/ o/IOS/ --match ssh m|^SSH-(\d[.\d]+)-CiscoIOS_([\d.]+)XA\r?\n| p/Cisco SSH/ v/$2/ i/protocol $1; Chinese IOS XA/ o/IOS/ -+match ssh m|^SSH-(\d[\d.]*)-(AKAMAI-I*)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/ -+match ssh m|^SSH-(\d[\d.]*)-(Server-V)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/ -+match ssh m|^SSH-(\d[\d.]*)-(Server-VI)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/ -+match ssh m|^SSH-(\d[\d.]*)-(Server-VII)\r?\n| p/Akamai SSH/ v/$2/ i/protocol $1/ -+match ssh m|^SSH-(\d[\d.]+)-Cisco-(\d[\d.]+)\r?\n$| p/Cisco SSH/ v/$2/ i/protocol $1/ o/IOS/ -+match ssh m|^SSH-(\d[\d.]+)-CiscoIOS_([\d.]+)XA\r?\n| p/Cisco SSH/ v/$2/ i/protocol $1; Chinese IOS XA/ o/IOS/ - match ssh m|^\r\nDestination server does not have Ssh activated\.\r\nContact Cisco Systems, Inc to purchase a\r\nlicense key to activate Ssh\.\r\n| p/Cisco CSS SSH/ i/Unlicensed/ --match ssh m|^SSH-(\d[.\d]+)-VShell_(\d[._\d]+) VShell\r?\n$| p/VanDyke VShell sshd/ v/$SUBST(2,"_",".")/ i/protocol $1/ -+match ssh m|^SSH-(\d[\d.]+)-VShell_(\d[_\d.]+) VShell\r?\n$| p/VanDyke VShell sshd/ v/$SUBST(2,"_",".")/ i/protocol $1/ - match ssh m|^SSH-2\.0-0\.0 \r?\n| p/VanDyke VShell sshd/ i/version info hidden; protocol 2.0/ - match ssh m|^SSH-([\d.]+)-([\w.]+) VShell\r?\n| p/VanDyke VShell/ v/$2/ i/protocol $1/ - match ssh m|^SSH-([\d.]+)-([\w.]+) \(beta\) VShell\r?\n| p/VanDyke VShell/ v/$2 beta/ i/protocol $1/ --match ssh m/^SSH-([.\d]+)-(\d[-.\w]+) sshlib: WinSSHD (\d[-.\w]+)\r?\n/ p/Bitvise WinSSHD/ v/$3/ i/sshlib $2; protocol $1/ o/Windows/ --match ssh m/^SSH-([.\d]+)-(\d[-.\w]+) sshlib: WinSSHD\r?\n/ p/Bitvise WinSSHD/ i/sshlib $2; protocol $1; server version hidden/ o/Windows/ --match ssh m|^SSH-([.\d]+)-([\w._-]+) sshlib: sshlibSrSshServer ([\w._-]+)\r\n| p/SrSshServer/ i/sshlib $2; protocol $1/ v/$3/ -+match ssh m/^SSH-([\d.]+)-(\d[-.\w]+) sshlib: WinSSHD (\d[-.\w]+)\r?\n/ p/Bitvise WinSSHD/ v/$3/ i/sshlib $2; protocol $1/ o/Windows/ -+match ssh m/^SSH-([\d.]+)-(\d[-.\w]+) sshlib: WinSSHD\r?\n/ p/Bitvise WinSSHD/ i/sshlib $2; protocol $1; server version hidden/ o/Windows/ -+match ssh m|^SSH-([\d.]+)-([\w._-]+) sshlib: sshlibSrSshServer ([\w._-]+)\r\n| p/SrSshServer/ i/sshlib $2; protocol $1/ v/$3/ - match ssh m|^SSH-([\d.]+)-([\w._-]+) sshlib: GlobalScape\r?\n| p/GlobalScape CuteFTP sshd/ i/sshlib $2; protocol $1/ o/Windows/ - match ssh m|^SSH-([\d.]+)-([\w._-]+) sshlib: EdmzSshDaemon ([\w._-]+)\r\n| p/EdmzSshDaemon/ v/$3/ i/sshlib $2; protocol $1/ --match ssh m|^SSH-([.\d]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+)\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1/ v/$3/ o/Windows/ --match ssh m|^SSH-([.\d]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+): free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ v/$3/ o/Windows/ --match ssh m|^SSH-([.\d]+)-([\w._-]+) FlowSsh: WinSSHD: free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ o/Windows/ -+match ssh m|^SSH-([\d.]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+)\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1/ v/$3/ o/Windows/ -+match ssh m|^SSH-([\d.]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+): free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ v/$3/ o/Windows/ -+match ssh m|^SSH-([\d.]+)-([\w._-]+) FlowSsh: WinSSHD: free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ o/Windows/ - # Cisco VPN 3000 Concentrator - # Cisco VPN Concentrator 3005 - Cisco Systems, Inc./VPN 3000 Concentrator Version 4.0.1.B Jun 20 2003 --match ssh m/^SSH-([.\d]+)-OpenSSH\r?\n$/ p/OpenSSH/ i/protocol $1/ d/terminal server/ -+match ssh m/^SSH-([\d.]+)-OpenSSH\r?\n$/ p/OpenSSH/ i/protocol $1/ d/terminal server/ - match ssh m|^SSH-1\.5-X\r?\n| p/Cisco VPN Concentrator SSHd/ i/protocol 1.5/ d/terminal server/ - match ssh m|^SSH-([\d.]+)-NetScreen\r?\n| p/NetScreen sshd/ i/protocol $1/ d/firewall/ - match ssh m|^SSH-1\.5-FucKiT RootKit by Cyrax\r?\n| p/FucKiT RootKit sshd/ i/**BACKDOOR** protocol 1.5/ o/Linux/ -@@ -2562,7 +2562,7 @@ match ssh m|^SSH-2\.0-dropbear_([-\w.]+)\r?\n| p/Dropbear sshd/ v/$1/ i/protocol - match ssh m|^Access to service sshd from [-\w_.]+@[-\w_.]+ has been denied\.\r\n| p/libwrap'd OpenSSH/ i/Access denied/ - match ssh m|^SSH-([\d.]+)-FortiSSH_([\d.]+)\r?\n| p/FortiSSH/ v/$2/ i/protocol $1/ - match ssh m|^SSH-([\d.]+)-cryptlib\r?\n| p/APC AOS cryptlib sshd/ i/protocol $1/ o/AOS/ --match ssh m/^SSH-([.\d]+)-([.\d]+) Radware\r?\n$/ p/Radware Linkproof SSH/ v/$2/ i/protocol $1/ d/terminal server/ -+match ssh m/^SSH-([\d.]+)-([\d.]+) Radware\r?\n$/ p/Radware Linkproof SSH/ v/$2/ i/protocol $1/ d/terminal server/ - match ssh m|^SSH-2\.0-1\.0 Radware SSH \r?\n| p/Radware sshd/ i|protocol 2.0| d/firewall/ - match ssh m|^SSH-([\d.]+)-Radware_([\d.]+)\r?\n| p/Radware sshd/ v/$2/ i/protocol $1/ d/firewall/ - match ssh m|^SSH-1\.5-By-ICE_4_All \( Hackers Not Allowed! \)\r?\n| p/ICE_4_All backdoor sshd/ i/**BACKDOOR** protocol 1.5/ -@@ -2599,8 +2599,8 @@ match ssh m|^SSH-1\.5-SSH\.0\.1\r?\n| p/Dell PowerConnect sshd/ i/protocol 1.5/ - match ssh m|^SSH-([\d.]+)-Ingrian_SSH\r?\n| p/Ingrian SSH/ i/protocol $1/ d/security-misc/ - match ssh m|^SSH-([\d.]+)-PSFTPd PE\. Secure FTP Server ready\r?\n| p/PSFTPd sshd/ i/protocol $1/ o/Windows/ - match ssh m|^SSH-([\d.]+)-BlueArcSSH_([\d.]+)\r?\n| p/BlueArc sshd/ v/$2/ i/protocol $1/ d/storage-misc/ --match ssh m|^SSH-([.\d]+)-Zyxel SSH server\r?\n| p/ZyXEL ZyWALL sshd/ o/ZyNOS/ d/security-misc/ i/protocol $1/ --match ssh m|^SSH-([.\d]+)-paramiko_([\w._-]+)\r?\n| p/Paramiko Python sshd/ v/$2/ i/protocol $1/ -+match ssh m|^SSH-([\d.]+)-Zyxel SSH server\r?\n| p/ZyXEL ZyWALL sshd/ o/ZyNOS/ d/security-misc/ i/protocol $1/ -+match ssh m|^SSH-([\d.]+)-paramiko_([\w._-]+)\r?\n| p/Paramiko Python sshd/ v/$2/ i/protocol $1/ - match ssh m|^SSH-([\d.]+)-USHA SSHv([\w._-]+)\r?\n| p/USHA SSH/ v/$2/ i/protocol $1/ d/power-device/ - match ssh m|^SSH-2\.0-SSH_0\.2\r?\n$| p/3com WAP sshd/ d/WAP/ v/0.2/ i/protocol 2.0/ - match ssh m|^SSH-([\d.]+)-CoreFTP-([\w._-]+)\r?\n| p/CoreFTP sshd/ v/$2/ i/protocol $1/ -@@ -2619,7 +2619,7 @@ match ssh m|^SSH-([\d.]+)-3Com OS-([\w._-]+ Release \w+)\n| p/3Com switch sshd/ - match ssh m|^SSH-2\.0-XXXX\r\n| p/Cyberoam firewall sshd/ d/firewall/ - match ssh m|^SSH-2\.0-Tc6l51-sD1m-m_\n| p/Fortinet FortiWifi 60C firewall sshd/ d/firewall/ - --softmatch ssh m/^SSH-([.\d]+)-/ i/protocol $1/ -+softmatch ssh m/^SSH-([\d.]+)-/ i/protocol $1/ - - - match soldat m|^Soldat Admin Connection Established\.\.\.\r\nAdmin connected\.\r\n| p/Soldat multiplayer-game server/ -@@ -2740,7 +2740,7 @@ match telnet m|^\xff\xfd\x1f\n\n\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* - match telnet m|^\r\nRaptor Firewall Secure Gateway\.\r\n| p/Symantec Raptor firewall secure gateway telnetd/ - match telnet m|^\r\nSynchronet BBS for Win32 Version (\d[-.\w]+)\r\n| p/Synchronet BBS/ v/$1/ i/on Win32/ - match telnet m|^\xff\xfb\x01\xff\xfb\x03\r\nlogin: $| p/Orinoco WAP telnetd/ --match telnet m|^\xff\xfd\x03\xff\xfb\x01\xff\xfb\x03\x1b\[1;1H\x1b\[2K\x1b\[2;1H\x1b\[2K\x1b\[3;1H\x1b.*Nortel Networks.*BayStack ([-.\w]+).*Versions: ([.: \w]+)|s p/Nortel Networks telnetd/ i/Baystack $1; Versions: $2/ d/switch/ -+match telnet m|^\xff\xfd\x03\xff\xfb\x01\xff\xfb\x03\x1b\[1;1H\x1b\[2K\x1b\[2;1H\x1b\[2K\x1b\[3;1H\x1b.*Nortel Networks.*BayStack ([-.\w]+).*Versions: ([: \w.]+)|s p/Nortel Networks telnetd/ i/Baystack $1; Versions: $2/ d/switch/ - match telnet m|^\xff\xfd\x03\xff\xfb\x01\xff\xfb\x03\x1b\[1;1H\x1b\[2K\x1b\[2;1H\x1b\[2K\x1b\[3;1H\x1b.*BayStack ([-\w_.]+) .*HW:(\w+) FW:V([\d.]+) SW:V([\d.]+)\x1b|s p/BayStack switch $1 telnetd/ v/HW:$2 FW:$3 SW:$4/ d/switch/ - # ASCII art banner that says "BAYSTACK" - match telnet m|^\xff\xfb\x01\x1b\[2J\x1b\[58259456;1H\x1b\[0m\x1b\[1;1H \*\*\*\*\* \*\*\* \* \* \*\*\*\*\* \*\*\*\*\*\*\*\*\* \*\*\* \*\*\*\*\* \* \*\x1b\[2;1H| p/BayStack switch telnetd/ d/switch/ -@@ -4536,7 +4536,7 @@ match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: SimpleServer:WWW/(\d[-.\w]+)\r\n| p - match http m|^HTTP/1\.[01] \d\d\d .*\r\nContent-Length: \d+\r\nX-Powered-By: ([-/.\w ]+)\r\nContent-Type: .*\r\nServer: Xitami\r\n| p/Xitami httpd/ i/$1/ - match http m|^HTTP/1\.[01] \d\d\d .*\r\nServer: Xitami\r\n|s p/Xitami httpd/ - match http m|^ERROR: Malformed startup string$| p/Xitami httpd admin port/ --match http m|^HTTP/1\.1 500 Server Error\r\nConnection: close\r\nContent-Length: \d+\r\nDate: .*\r\nServer: Radio UserLand/(\d[.\w ]+)-([-.\w ]+)\r\n\r\n| p/Radio Userland blog server/ v/$1/ i/$2/ -+match http m|^HTTP/1\.1 500 Server Error\r\nConnection: close\r\nContent-Length: \d+\r\nDate: .*\r\nServer: Radio UserLand/(\d[\w .]+)-([-.\w ]+)\r\n\r\n| p/Radio Userland blog server/ v/$1/ i/$2/ - match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: (prod )?[Ff]red (\d[-.\w]+) \(build (\d+)\) HTTP Servlets\r\n\r\n|s p/Freenet Fred anonymous P2P/ v/$2 build $3/ - match http m|^HTTP/1\.0 200 Ok\r\nServer: diva_httpd\r\n| p/Eicon Diva ISDN card configuration server/ - match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: Resin/(\d[-.\w]+)\r\n| p/Caucho Resin JSP engine/ v/$1/ -@@ -4752,9 +4752,9 @@ match http m|^HTTP/1\.[01] \d\d\d .*\r\nServer: Domino-Go-Webserver/([\d.]+)\r\n - match http m|^HTTP/1.1 302 Document Follows\r\nLocation: /hag/pages/home.ssi\r\n\r\n$| p/GlobespanVirata httpd/ i/on broadband router/ - match http m|^HTTP/1.0 200 OK\r\nServer:HTTP/1.0\r\n.*Hewlett Packard|s p/HP Jetdirect httpd/ - match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: EHTTP/([\d.]+)\r\nPragma:no-cache\r\nContent-Type:text/html\r\n\r\n \n\n \n(.*) \n- HP (J\w+) ProCurve Switch (\w+)\n| p/HP $3 Procurve Switch $4 http config/ i/EHTTPd $1; Name $2/ d/switch/ --match http m|^HTTP/1\.0 401 Unauthorized\r\nServer: EHTTP/([.\d]+)\r\nWWW-Authenticate: Basic realm=\"HP ([-.\w]+)\"\r\n| p/HP switch EHTTP admin server/ v/$1/ i/HP $2 switch/ d/switch/ -+match http m|^HTTP/1\.0 401 Unauthorized\r\nServer: EHTTP/([\d.]+)\r\nWWW-Authenticate: Basic realm=\"HP ([-.\w]+)\"\r\n| p/HP switch EHTTP admin server/ v/$1/ i/HP $2 switch/ d/switch/ - match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: Virata-EmWeb/([-.\w]+)\r\n.*\r\n\r\n\n + - // Connect to database - $pkgDAO->connect(); - ?> - getTotalNumberOfPackages(); +
> +

+ - echo "$numPkg" ; - ?> - Packages - -
- - - - -
- -
-
- - getTotalNumberOfPackageUpdateOverCurrentMonth(); - $numYearlyPkg = $pkgDAO->getTotalNumberOfPackageUpdateOverCurrentRollingYear(); +
+ +
+ +
- echo "$numMonthlyPkg / $numYearlyPkg" ; - ?> - Updates - - -
- - - -
- -
-
- - getTotalNumberOfPackageCreationOverCurrentMonth(); - $numYearlyPkg = $pkgDAO->getTotalNumberOfPackageCreationOverCurrentRollingYear(); + - echo "$numMonthlyPkg / $numYearlyPkg" ; + - // Disconnect from database - $pkgDAO->disconnect(); - ?> - Additions - -
-
- - - - - -

Latest news

- - - - - -
- -
- View more ... - - - -

Releases and updates

- - - - - -
- -
- View more ... - - - - - + + + + + + + + + Modified: web/wordpresscsw/wp-content/themes/opencsw/style.css =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/style.css 2014-03-26 20:49:21 UTC (rev 675) +++ web/wordpresscsw/wp-content/themes/opencsw/style.css 2014-04-20 21:50:43 UTC (rev 676) @@ -883,9 +883,14 @@ #announce { padding-bottom: 25px; } #announce h1 { margin-top: 20px; } -#announce p { padding-bottom: 5px; display: inline; } -#announce .announce-date { margin-right: 10px; } +#announce p { padding-bottom: 5px; display: } +#announce .announce-date { margin-right: 5px; } +#announce img { margin-right: 5px; margin-top: 0px; } +.announce-headline { margin-right: 5px; } +.announce-excerpt { margin-bottom: 5px; } +p.announce-more { font-size: 13px; } + #download { padding-left: 20px; } #download img { display: block; margin-left: auto; margin-right: auto; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 21 10:45:23 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 08:45:23 +0000 Subject: SF.net SVN: gar:[23444] csw/mgar/pkg/cpan/XML-DOM/trunk/Makefile Message-ID: <3gC1hF3hPbzp0@mail.opencsw.org> Revision: 23444 http://sourceforge.net/p/gar/code/23444 Author: wahwah Date: 2014-04-21 08:45:21 +0000 (Mon, 21 Apr 2014) Log Message: ----------- cpan/XML-DOM/trunk: Package rename Modified Paths: -------------- csw/mgar/pkg/cpan/XML-DOM/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-DOM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-DOM/trunk/Makefile 2014-04-20 19:11:54 UTC (rev 23443) +++ csw/mgar/pkg/cpan/XML-DOM/trunk/Makefile 2014-04-21 08:45:21 UTC (rev 23444) @@ -4,15 +4,21 @@ GARTYPE = v2 AUTHOR = TJMATHER -DESCRIPTION = module for building DOM Level 1 compliant document structures +DESCRIPTION = Building DOM Level 1 compliant document structures define BLURB This module extends the XML::Parser module by Clark Cooper. The XML::Parser module is built on top of XML::Parser::Expat, which is a lower level interface to James Clark's expat library. endef -DISTFILES += $(call admfiles,CSWpmxmldom,depend) +# DISTFILES += $(call admfiles,CSWpmxmldom,depend) +PACKAGES = CSWpm-xmldom +SPKG_DESC_CSWpm-xmldom = $(DESCRIPTION) +ARCHALL_CSWpm-xmldom = 1 + +OBSOLETED_BY_CSWpm-xmldom = CSWpmxmldom + #DEPENDS += cpan/XML-Parser DEPENDS += cpan/XML-RegExp #DEPENDS += cpan/libwww-perl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 21 11:15:27 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 09:15:27 +0000 Subject: SF.net SVN: gar:[23445] csw/mgar/pkg/tofrodos/trunk Message-ID: <3gC2Ly58D9zt4@mail.opencsw.org> Revision: 23445 http://sourceforge.net/p/gar/code/23445 Author: wahwah Date: 2014-04-21 09:15:25 +0000 (Mon, 21 Apr 2014) Log Message: ----------- tofrodos/trunk: Version bump Modified Paths: -------------- csw/mgar/pkg/tofrodos/trunk/Makefile csw/mgar/pkg/tofrodos/trunk/checksums Modified: csw/mgar/pkg/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile 2014-04-21 08:45:21 UTC (rev 23444) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2014-04-21 09:15:25 UTC (rev 23445) @@ -1,5 +1,5 @@ NAME = tofrodos -VERSION = 1.7.8 +VERSION = 1.7.13 GARTYPE = v2 DESCRIPTION = Text file utility that converts files between MSDOS and Unix format. @@ -12,25 +12,27 @@ WORKSRC ?= $(WORKDIR)/$(NAME)/src MASTER_SITES = http://tofrodos.sourceforge.net/download/ +VENDOR_URL = http://www.thefreecountry.com/tofrodos/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +UPSTREAM_MASTER_SITES = http://www.thefreecountry.com/tofrodos/ +UFILES_REGEX = Version\s(\d+(?:\.\d+)*) +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = -#BUILD_ARGS = CC=$(CC) LD=$(CC) MAKE=$(MAKE) CDEBUG= CFLAGS="$(CFLAGS) -c" BUILD_ARGS = CC=$(CC) LD=$(CC) MAKE=$(MAKE) CDEBUG= CFLAGS="$(CFLAGS) -c -Dstricmp=strcasecmp" TEST_SCRIPTS = INSTALL_ARGS = BINDIR=$(DESTDIR)$(bindir) MANDIR=$(DESTDIR)$(mandir)/man1 INSTALL=$(bindir)/ginstall +include gar/category.mk + pre-install-modulated: @echo "Creating directories" mkdir -p $(DESTDIR)$(bindir) @@ -42,5 +44,3 @@ ln -s ./fromdos $(DESTDIR)$(bindir)/unix2dos ln -s ./fromdos.1 $(DESTDIR)$(mandir)/man1/dos2unix ln -s ./fromdos.1 $(DESTDIR)$(mandir)/man1/unix2dos - -include gar/category.mk Modified: csw/mgar/pkg/tofrodos/trunk/checksums =================================================================== --- csw/mgar/pkg/tofrodos/trunk/checksums 2014-04-21 08:45:21 UTC (rev 23444) +++ csw/mgar/pkg/tofrodos/trunk/checksums 2014-04-21 09:15:25 UTC (rev 23445) @@ -1 +1 @@ -aaa044f9817a048e126d9eb7a7535e96 tofrodos-1.7.8.tar.gz +c4c5e6668a13a01bfb5ce562753a808f tofrodos-1.7.13.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 Apr 21 15:49:08 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Apr 2014 13:49:08 +0000 Subject: SF.net SVN: gar:[23446] csw/mgar/pkg/tmux/trunk Message-ID: <3gC8Qr0JWWz180@mail.opencsw.org> Revision: 23446 http://sourceforge.net/p/gar/code/23446 Author: dmichelsen Date: 2014-04-21 13:49:06 +0000 (Mon, 21 Apr 2014) Log Message: ----------- tmux/trunk: Update to 1.9a, cleanup Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2014-04-21 09:15:25 UTC (rev 23445) +++ csw/mgar/pkg/tmux/trunk/Makefile 2014-04-21 13:49:06 UTC (rev 23446) @@ -1,5 +1,5 @@ NAME = tmux -VERSION = 1.9 +VERSION = 1.9a GARTYPE = v2 DESCRIPTION = Terminal Multiplexer @@ -15,24 +15,6 @@ RUNTIME_DEP_PKGS = CSWlibevent2-0-5 -# EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw -#EXTRA_CPPFLAGS += -D__inline=inline -# Grabbed from Solaris 10 /usr/include/iso/math_c99.h -#EXTRA_CPPFLAGS += -DINFINITY=__builtin_infinity - -# Make sure tmux.conf is found in /etc/opt/csw as reported in #4696 -#REINPLACEMENTS += tmuxconf -#REINPLACE_MATCH_tmuxconf = /etc/tmux\.conf -#REINPLACE_WITH_tmuxconf = $(sysconfdir)/tmux.conf -#REINPLACE_FILES_tmuxconf += tmux.h -#REINPLACE_FILES_tmuxconf += tmux.1 - -# CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) - PRESERVECONF += $(sysconfdir)/tmux.conf include gar/category.mk - -xxxpost-extract: - cd $(WORKSRC) && ./autogen.sh - @$(MAKECOOKIE) Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2014-04-21 09:15:25 UTC (rev 23445) +++ csw/mgar/pkg/tmux/trunk/checksums 2014-04-21 13:49:06 UTC (rev 23446) @@ -1 +1 @@ -5f5ed0f03a666279264da45b60075600 tmux-1.9.tar.gz +b07601711f96f1d260b390513b509a2d tmux-1.9a.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 Apr 21 15:57:02 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Apr 2014 13:57:02 +0000 Subject: SF.net SVN: gar:[23447] csw/mgar/pkg/tmux/trunk/Makefile Message-ID: <3gC8bq13Pcz1CV@mail.opencsw.org> Revision: 23447 http://sourceforge.net/p/gar/code/23447 Author: dmichelsen Date: 2014-04-21 13:57:02 +0000 (Mon, 21 Apr 2014) Log Message: ----------- tmux/trunk: Switch to GCC and see if the bug reports #5165 go away Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2014-04-21 13:49:06 UTC (rev 23446) +++ csw/mgar/pkg/tmux/trunk/Makefile 2014-04-21 13:57:02 UTC (rev 23447) @@ -13,6 +13,8 @@ BUILD_DEP_PKGS = CSWlibevent-dev +GARCOMPILER = GNU + RUNTIME_DEP_PKGS = CSWlibevent2-0-5 PRESERVECONF += $(sysconfdir)/tmux.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 21 17:18:38 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 15:18:38 +0000 Subject: SF.net SVN: gar:[23448] csw/mgar/pkg Message-ID: <3gCBQ13GN9z1Nk@mail.opencsw.org> Revision: 23448 http://sourceforge.net/p/gar/code/23448 Author: wahwah Date: 2014-04-21 15:18:35 +0000 (Mon, 21 Apr 2014) Log Message: ----------- gsview/trunk: Initial commit, doesn't build and probably won't build. The directory here is left as a warning. Added Paths: ----------- csw/mgar/pkg/gsview/ csw/mgar/pkg/gsview/Makefile csw/mgar/pkg/gsview/branches/ csw/mgar/pkg/gsview/tags/ csw/mgar/pkg/gsview/trunk/ csw/mgar/pkg/gsview/trunk/Makefile csw/mgar/pkg/gsview/trunk/checksums csw/mgar/pkg/gsview/trunk/files/ Added: csw/mgar/pkg/gsview/Makefile =================================================================== --- csw/mgar/pkg/gsview/Makefile (rev 0) +++ csw/mgar/pkg/gsview/Makefile 2014-04-21 15:18:35 UTC (rev 23448) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gsview/trunk =================================================================== --- csw/mgar/pkg/gsview/trunk 2014-04-21 13:57:02 UTC (rev 23447) +++ csw/mgar/pkg/gsview/trunk 2014-04-21 15:18:35 UTC (rev 23448) Property changes on: csw/mgar/pkg/gsview/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gsview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsview/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gsview/trunk/Makefile 2014-04-21 15:18:35 UTC (rev 23448) @@ -0,0 +1,35 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! The build instruction for unix are wrong. They reference files that don't +# exist (srcunx/unx.mak). There isn't any information online about how to +# build gsview-5.0. We can't build gsview-4.9 because our ghostscript it too +# new. + +NAME = gsview +VERSION = 5.0 +GARTYPE = v2 + +DESCRIPTION = Brief description + +MASTER_SITES = http://pages.cs.wisc.edu/~ghost/gsview/download/ +DISTFILES = gsv50src.zip + +CONFIGURE_SCRIPTS = + +BUILD_SCRIPTS = custom + +include gar/category.mk + + +# post-extract: +# cd $(WORKDIR) && \ +# unzip -aa gsv50src.zip && \ +# unzip -o "gsview-5.0/binary/*" +# @$(MAKECOOKIE) + +build-custom: + false +# cd $(WORKSRC) && \ +# cp srcunx/unx.mak Makefile && \ +# gmake Property changes on: csw/mgar/pkg/gsview/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gsview/trunk/checksums =================================================================== --- csw/mgar/pkg/gsview/trunk/checksums (rev 0) +++ csw/mgar/pkg/gsview/trunk/checksums 2014-04-21 15:18:35 UTC (rev 23448) @@ -0,0 +1 @@ +01cc83d9706b33c6314c43031f433634 gsv50src.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 Mon Apr 21 17:21:11 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 21 Apr 2014 15:21:11 +0000 Subject: SF.net SVN: gar:[23449] csw/mgar/pkg/gnutls3/trunk Message-ID: <3gCBSv027Sz1S8@mail.opencsw.org> Revision: 23449 http://sourceforge.net/p/gar/code/23449 Author: chninkel Date: 2014-04-21 15:21:10 +0000 (Mon, 21 Apr 2014) Log Message: ----------- gnutls3/trunk: updated to 3.1.23 Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile csw/mgar/pkg/gnutls3/trunk/checksums Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-21 15:18:35 UTC (rev 23448) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-21 15:21:10 UTC (rev 23449) @@ -1,5 +1,5 @@ NAME = gnutls -VERSION = 3.1.22 +VERSION = 3.1.23 DESCRIPTION = GNU Transport Layer Security libraries and tools define BLURB Modified: csw/mgar/pkg/gnutls3/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls3/trunk/checksums 2014-04-21 15:18:35 UTC (rev 23448) +++ csw/mgar/pkg/gnutls3/trunk/checksums 2014-04-21 15:21:10 UTC (rev 23449) @@ -1 +1 @@ -dbce77e502a5643961d3683b6e8f3bd5 gnutls-3.1.22.tar.xz +eb4bcd0f593a9cc5cb674e903943ff07 gnutls-3.1.23.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 21 17:49:42 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 15:49:42 +0000 Subject: SF.net SVN: gar:[23450] csw/mgar/pkg/glib/trunk/Makefile Message-ID: <3gCC5p4xWGzX@mail.opencsw.org> Revision: 23450 http://sourceforge.net/p/gar/code/23450 Author: wahwah Date: 2014-04-21 15:49:41 +0000 (Mon, 21 Apr 2014) Log Message: ----------- glib/trunk: We need to include more .h files in the *-dev package Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2014-04-21 15:21:10 UTC (rev 23449) +++ csw/mgar/pkg/glib/trunk/Makefile 2014-04-21 15:49:41 UTC (rev 23450) @@ -25,17 +25,13 @@ PACKAGES += CSWglib-dev SPKG_DESC_CSWglib-dev = $(DESCRIPTION), development files -PKGFILES_CSWglib-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWglib-dev += $(sharedstatedir)/gtk-doc/.* +# PKGFILES_CSWglib-dev = $(PKGFILES_DEVEL) +# PKGFILES_CSWglib-dev += $(sharedstatedir)/gtk-doc/.* RUNTIME_DEP_PKGS_CSWglib-dev += CSWlibgmodule1-2-0 RUNTIME_DEP_PKGS_CSWglib-dev += CSWlibglib1-2-0 RUNTIME_DEP_PKGS_CSWglib-dev += CSWlibgthread1-2-0 # Historical reasons -OBSOLETED_BY_CSWglib-dev = CSWglib-devel -CATALOGNAME_CSWglibdevel = glib_devel -# CHECKPKG_OVERRIDES_CSWglibdevel += catalogname-does-not-match-pkgname|pkgname=CSWglibdevel|catalogname=glib_devel|expected-catalogname=glibdevel - PACKAGES += CSWlibglib1-2-0 CATALOGNAME_CSWlibglib1-2-0 = libglib1_2_0 PKGFILES_CSWlibglib1-2-0 += $(call baseisadirs,$(libdir),libglib-1\.2\.so\.0(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 21 21:55:31 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 19:55:31 +0000 Subject: SF.net SVN: gar:[23451] csw/mgar/pkg/glib/trunk/Makefile Message-ID: <3gCJYV3qcWzdy@mail.opencsw.org> Revision: 23451 http://sourceforge.net/p/gar/code/23451 Author: wahwah Date: 2014-04-21 19:55:30 +0000 (Mon, 21 Apr 2014) Log Message: ----------- glib/trunk: Second build on the same day Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2014-04-21 15:49:41 UTC (rev 23450) +++ csw/mgar/pkg/glib/trunk/Makefile 2014-04-21 19:55:30 UTC (rev 23451) @@ -50,3 +50,6 @@ OBSOLETED_BY_CSWlibgthread1-2-0 = CSWglib include gar/category.mk + +# Remove after 2014-04-21 +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Apr 21 22:28:44 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 21 Apr 2014 20:28:44 +0000 Subject: SF.net SVN: gar:[23452] csw/mgar/pkg/tor/branches/alpha/ Message-ID: <3gCKHm39w6zkb@mail.opencsw.org> Revision: 23452 http://sourceforge.net/p/gar/code/23452 Author: jake_goerzen Date: 2014-04-21 20:28:43 +0000 (Mon, 21 Apr 2014) Log Message: ----------- create alpha code release branch to test building on Solaris Added Paths: ----------- csw/mgar/pkg/tor/branches/alpha/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Apr 21 23:14:28 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 21 Apr 2014 21:14:28 +0000 Subject: SF.net SVN: gar:[23453] csw/mgar/gar/v2/bin/cswch Message-ID: <3gCLJn73lwzql@mail.opencsw.org> Revision: 23453 http://sourceforge.net/p/gar/code/23453 Author: guengel Date: 2014-04-21 21:14:28 +0000 (Mon, 21 Apr 2014) Log Message: ----------- bin/cswch: script for managing OpenCSW changelogs. Still work in progress. Added Paths: ----------- csw/mgar/gar/v2/bin/cswch Added: csw/mgar/gar/v2/bin/cswch =================================================================== --- csw/mgar/gar/v2/bin/cswch (rev 0) +++ csw/mgar/gar/v2/bin/cswch 2014-04-21 21:14:28 UTC (rev 23453) @@ -0,0 +1,553 @@ +#!/usr/bin/env python +""" +Maintain OpenCSW changelog + +$Id$ +""" +import argparse +import datetime +import dateutil.tz +import email.utils +import os +import pwd +import re +import sys +import time +import unittest +import logging + +### T E S T S ### + +class TestOpenCSWRev(unittest.TestCase): + """Test opencsw_rev()""" + + def test_opencsw_rev(self): + """revision string from date""" + rev = ChangeLogHeader.opencsw_rev(datetime.date(1979, 1, 1)) + self.assertEqual(rev, '1979.01.01') + + def test_opencsw_rev_default(self): + """revision from current date""" + rev = ChangeLogHeader.opencsw_rev() + self.assertEqual(rev, datetime.date.today().strftime('%Y.%m.%d')) + + +class TestChangeLogHeader(unittest.TestCase): + """Test ChangeLogHeader""" + + def test_changelogheader(self): + """initialize changelog header with keywords""" + chlg = ChangeLogHeader(package='test', version='0.1', rev='1991.09.04') + self.assertEqual('test (0.1,REV=1991.09.04)', str(chlg)) + + def test_parser(self): + """initialize changelog header from line""" + chlg = ChangeLogHeader(line='test (0.1,REV=1991.09.04)') + self.assertEqual('test (0.1,REV=1991.09.04)', str(chlg)) + + def test_garbled(self): + """test garbled changelog header""" + self.assertRaises(GarbledChangeLogHeader, + ChangeLogHeader, line='test (0,REV=1991.9.4)') + + +class TestChangeLogFooter(unittest.TestCase): + """Test ChangeLogFooter""" + + def test_changelogfooter(self): + """initialize changelog footer from arguments""" + chlg = ChangeLogFooter(maintainer="Rafael Ostertag", + email="raos at opencsw.org", + timestamp=datetime.datetime(1979, 1, 1, + 0, 0, 0)) + self.assertEqual(' -- Rafael Ostertag Mon, 01 Jan 1979 00:00:00 +0100', str(chlg)) + + def test_parser(self): + """initialize changelog footer from line""" + test_footer = ' -- Rafael Ostertag Sun, 16 Mar 2014 10:10:33 +0100' + chlg = ChangeLogFooter(line=test_footer) + self.assertEqual(test_footer, str(chlg)) + + def test_garbled(self): + """test garbled changelog footer""" + self.assertRaises(GarbledChangeLogFooter, + ChangeLogFooter, line=' -- Rafael Ostertag Sun, 16 Mar 2014 10:10:33 +010') + + +class TestChangeLogParagraph(unittest.TestCase): + """Test ChangeLogParagraph.""" + + def test_init_single_line(self): + """initialize ChangeLog paragraph with one line""" + line = ' * Lorem ipsum dolor sit amet, consectetur adipiscing' + chpg = ChangeLogParagraph(line) + self.assertEqual(line, str(chpg)) + self.assertEqual('Lorem ipsum dolor sit amet, consectetur adipiscing', + repr(chpg)) + + def test_newline_handling(self): + """test newline handling of ChangeLogParagraph""" + lines = """ * Lorem ipsum dolor sit amet, + consectetur adipiscing""" + chpg = ChangeLogParagraph(lines) + self.assertEqual(' * Lorem ipsum dolor sit amet, consectetur adipiscing', str(chpg)) + self.assertEqual('Lorem ipsum dolor sit amet, consectetur adipiscing', repr(chpg)) + + def test_init_from_multiple_lines(self): + """Test initialization from multiple lines""" + + lines = ['Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent posuere est a pellentesque imperdiet.', + 'Vivamus dapibus enim eu magna vehicula posuere. Pellentesque adipiscing purus id diam auctor gravida. Sed leo odio,', + 'molestie quis ante sed, commodo consequat nulla. Vivamus interdum vel lorem eget faucibus. Suspendisse dignissim orci sit amet dolor venenatis convallis.', + 'Suspendisse fringilla tortor vitae dolor blandit ullamcorper. Cras sed mauris eu lorem scelerisque blandit quis vel mauris. Nam a urna aliquet, cursus erat a, fermentum justo. Sed hendrerit dui magna, ac tempus est vestibulum at.', + 'Duis in massa ut nisl euismod auctor nec ac odio. Phasellus suscipit neque quis metus vestibulum molestie. Phasellus eget molestie elit, et fringilla purus. Morbi augue lectus, mattis ut mauris onvallis, eleifend condimentum nunc. Phasellus sit amet facilisis massa. Cras non porttitor turpis.'] + formatted = """ * Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent + posuere est a pellentesque imperdiet. Vivamus dapibus enim eu magna + vehicula posuere. Pellentesque adipiscing purus id diam auctor + gravida. Sed leo odio, molestie quis ante sed, commodo consequat + nulla. Vivamus interdum vel lorem eget faucibus. Suspendisse + dignissim orci sit amet dolor venenatis convallis. Suspendisse + fringilla tortor vitae dolor blandit ullamcorper. Cras sed mauris eu + lorem scelerisque blandit quis vel mauris. Nam a urna aliquet, + cursus erat a, fermentum justo. Sed hendrerit dui magna, ac tempus + est vestibulum at. Duis in massa ut nisl euismod auctor nec ac odio. + Phasellus suscipit neque quis metus vestibulum molestie. Phasellus + eget molestie elit, et fringilla purus. Morbi augue lectus, mattis + ut mauris onvallis, eleifend condimentum nunc. Phasellus sit amet + facilisis massa. Cras non porttitor turpis.""" + chpg = ChangeLogParagraph(*lines) + self.assertEqual(formatted, str(chpg)) + + +### C O D E ### + +class GarbledChangeLogHeader(Exception): + """Garbled ChangeLog header + + Raised if parsing of ChangeLog header fails. + + """ + def __init__(self, header): + super(GarbledChangeLogHeader, self).__init__() + self.header = header + + def __str__(self): + return "Garbled ChangeLog header: %s" % self.header + + def __repr__(self): + return str(self) + + +class GarbledChangeLogFooter(Exception): + """Garbled ChangeLog footer + + Raised if parsing of ChangeLog footer fails. + + """ + def __init__(self, footer): + super(GarbledChangeLogFooter, self).__init__() + self.footer = footer + + def __str__(self): + return "Garbled ChangeLog footer: %s" % self.footer + + def __repr__(self): + return str(self) + + +class ChangeLogHeader(object): + """Constitutes a changelog header. + + It has the form + + package (version,REV=rev) + + and marks the start of a changelog entry. + + """ + def __init__(self, **kwargs): + """Initialize ChangeLogHeader + + :param line: parses the given line + + :param package: the package name + + :param version: version of the upstream packages + + :param rev: revision of the opencsw package + + """ + if 'line' in kwargs: + self.parse_line(kwargs['line']) + return + + assert 'package' in kwargs and 'version' in kwargs + + self.package = kwargs['package'] + self.version = kwargs['version'] + + if 'rev' not in kwargs: + self.rev = ChangeLogHeader.opencsw_rev() + else: + self.rev = kwargs['rev'] + + def __str__(self): + """Get the ChangeLog header""" + return ChangeLogHeader.format_str % {'package': self.package, + 'version': self.version, + 'rev': self.rev} + + def parse_line(self, line): + """Parse ChangeLog header + + Dissect a ChangeLog header into package, version, and + revision. + + """ + matches = ChangeLogHeader.compiled_re.match(line) + + if matches is None: + raise GarbledChangeLogHeader(line) + + self.package = matches.group('package') + self.version = matches.group('version') + self.rev = matches.group('rev') + + @classmethod + def opencsw_rev(cls, date=None): + """Convert a date to as string suitable for REV= + + If no date is specified, the current date is used. + + """ + if date is None: + date = datetime.date.today() + + return date.strftime('%Y.%m.%d') + + format_str = r'%(package)s (%(version)s,REV=%(rev)s)' + parse_re = r'(?P[\w-]+) \((?P[\d\.]+),REV=(?P\d{4}\.\d{2}\.\d{2})\)' + compiled_re = re.compile(parse_re) + + +class ChangeLogFooter(object): + """End a changelog entry. + + It has the form + + [one space]-- maintainer name [two spaces] date + """ + def __init__(self, **kwargs): + if len(kwargs) == 0: + maintainer = ChangeLogFooter.get_maintainer() + self.maintainer = maintainer[0] + self.email = maintainer[1] + self.timestamp = ChangeLogFooter.get_rfc2822timestamp() + + return + + if 'line' in kwargs: + self.parse_line(kwargs['line']) + return + + assert 'maintainer' in kwargs and 'email' in kwargs + + self.maintainer = kwargs['maintainer'] + self.email = kwargs['email'] + + if 'timestamp' in kwargs: + self.timestamp = ChangeLogFooter.get_rfc2822timestamp(kwargs['timestamp']) + else: + self.timestamp = ChangeLogFooter.get_rfc2822timestamp() + + def __str__(self): + return ChangeLogFooter.format_str % {'maintainer': self.maintainer, + 'email': self.email, + 'timestamp': self.timestamp} + + def parse_line(self, line): + """Parse ChangeLog footer + + Dissect a ChangeLog footer into maintainer, email, and + timestamp. + + """ + matches = ChangeLogFooter.compiled_re.match(line) + + if matches is None: + raise GarbledChangeLogFooter(line) + + self.maintainer = matches.group('maintainer') + self.email = matches.group('email') + self.timestamp = matches.group('timestamp') + + @classmethod + def get_rfc2822timestamp(cls, date_obj=None): + """Return a timestamp in the proper format. + + The proper format is a timestamp in the format specified in RFC + 2822. + + :param dt: datetime object or none, in which case the current time + will be taken. + + """ + if date_obj is None: + timezone = dateutil.tz.tzlocal() + today = datetime.datetime.now(timezone) + return email.utils.formatdate(time.mktime(today.timetuple()), True) + + return email.utils.formatdate(time.mktime(date_obj.timetuple()), True) + + @classmethod + def get_maintainer(cls): + """Get maintainer name and email. + + Return maintainer and email as tuple. + + """ + if 'LOGNAME' in os.environ: + fullname = pwd.getpwnam(os.environ['LOGNAME'])[4] + m_email = "%s at opencsw.org" % os.environ['LOGNAME'] + else: + fullname = pwd.getpwnam(os.getlogin())[4] + m_email = "%s at opencsw.org" % os.getlogin() + + return (fullname, m_email) + + format_str = r' -- %(maintainer)s <%(email)s> %(timestamp)s' + parse_re = r' -- (?P[\w\d ]+) <(?P[\w\d@ \.]+)> (?P\w{3}, \d{1,2} \w{3} \d{4} \d{2}:\d{2}:\d{2} (\+|-)\d{4})' + compiled_re = re.compile(parse_re) + + +class ChangeLogParagraph(object): + """A changelog paragraph + + It has the form + + [two spaces]* change details + more change details + """ + def __init__(self, *args, **kwargs): + """Initialize ChangeLog paragraph. + + Initialize ChangeLog paragraph from one ore several + lines. Optionally, maxcol can be specified. + + """ + assert len(args) > 0 + + if 'maxcol' in kwargs: + self.maxcol = kwargs['maxcol'] + else: + self.maxcol = 72 + + self.paragraph = "" + # Get rid of all leading '\s+\*?\s+' and concatenate all + # arguments. + self.paragraph = " ".join([ChangeLogParagraph.sanitize_re_c.sub("", l) for l in args]) + + # Some sanitation + self.paragraph = self.paragraph.strip() + self.paragraph = ChangeLogParagraph.whitespace_re_c.sub(' ', + self.paragraph) + + def __repr__(self): + return self.paragraph + + def __str__(self): + words = self.paragraph.split() + + # line length starts at 4, because we have to take ' * ' into + # account for the first line. + line_len = 4 + formatted_paragraph = ' * ' + for word in words: + if len(word) + line_len <= self.maxcol: + formatted_paragraph = formatted_paragraph + word + ' ' + line_len = line_len + len(word) + 1 + else: + # chop off the last space + formatted_paragraph = formatted_paragraph.rstrip() + # add newline and reset line length counter + formatted_paragraph = formatted_paragraph + '\n ' + word + ' ' + line_len = 5 + len(word) + + formatted_paragraph = formatted_paragraph.rstrip() + return formatted_paragraph + + sanitize_re = r'^\s+\*\s+' + sanitize_re_c = re.compile(sanitize_re) + whitespace_re = r'\s{2,}|\n+' + whitespace_re_c = re.compile(whitespace_re) + +def slurpin_changelog(filename): + """Load existing changelog""" + + with open(filename, "r") as fobj: + changelog_entries = list() + paragraph = list() + + only_whitespace_re = re.compile(r'^\s+$') + entry_start_re = re.compile(r'^[\w\d\.=(),]+') + + for line in fobj: + line = line.rstrip('\n') + + if only_whitespace_re.match(line) or line == "": + continue + + # is it the start of an entry? + if entry_start_re.match(line): + entry_dict = {'header': ChangeLogHeader(line=line)} + continue + + # is it the footer, and thus marks the end of a entry? + if line.startswith(' -- '): + # is there a paragraph pending? + if len(paragraph) > 0: + # add that paragraph to the dict and start a new + # one + if 'paragraphs' in entry_dict: + entry_dict['paragraphs'].append(ChangeLogParagraph(*paragraph)) + else: + entry_dict['paragraphs'] = [ChangeLogParagraph(*paragraph)] + paragraph = list() + + entry_dict['footer'] = ChangeLogFooter(line=line) + # append to the list + changelog_entries.append(entry_dict) + continue + + # is it the start of an entry paragraph? + if line.startswith(' * '): + # is the first item of the paragraph list a paragraph + # start? + if len(paragraph) > 0 and paragraph[0].startswith(' * '): + # add that paragraph to the dict and start a new + # one + if 'paragraphs' in entry_dict: + entry_dict['paragraphs'].append(ChangeLogParagraph(*paragraph)) + else: + entry_dict['paragraphs'] = [ChangeLogParagraph(*paragraph)] + + paragraph = [line] + continue + + # It's not, the start, end, or start of entry paragraph, + # thus it must be a continuation of a paragraph + paragraph.append(line) + + return changelog_entries + + +def dump_entries(filename, entries): + with open(filename, 'w') as fobj: + for entry in entries: + fobj.write(str(entry['header'])) + fobj.write('\n\n') + for paragraph in entry['paragraphs']: + fobj.write(str(paragraph)) + fobj.write('\n\n') + fobj.write(str(entry['footer'])) + fobj.write('\n\n') + + +def new_changelog_entry(filename, version, log): + existing_entries = slurpin_changelog(filename) + + assert len(existing_entries) > 0 + + # get the package from the first entry + package = existing_entries[0]['header'].package + + header = ChangeLogHeader(package=package, + version=version) + paragraphs = [ChangeLogParagraph(log_para) for log_para in log] + footer = ChangeLogFooter() + + existing_entries.insert(0, {'header': header, + 'paragraphs': paragraphs, + 'footer': footer}) + + dump_entries(filename, existing_entries) + + +def create_changelog_file(filename, overwrite, package, version, log): + chlg_header = ChangeLogHeader(package=package, + version=version) + chlg_footer = ChangeLogFooter() + chlg_paragraphs = [ChangeLogParagraph(log_para) for log_para in log] + + if os.access(filename, os.F_OK) and not overwrite: + logging.error("Changelog '%s' already exists. Won't overwrite", filename) + sys.exit(1) + + with open(filename,'w+') as fobj: + fobj.write(str(chlg_header)) + fobj.write('\n\n') + for paragraph in chlg_paragraphs: + fobj.write(str(paragraph)) + fobj.write('\n\n') + fobj.write(str(chlg_footer)) + fobj.write('\n\n') + +def cmdline_parse(): + """Parse the command line + + Returns the result of argparse.parse_args() + + """ + parser = argparse.ArgumentParser(description="Maintain OpenCSW changelogs") + parser.add_argument('--logfile', + help='filename to use (default: %(default)s)', + default='files/changelog.CSW') + subparser = parser.add_subparsers(help='sub-command help', + dest='command') + + parser_create = subparser.add_parser('create', + help="create new changelog.CSW file. Existing file will not be overwritten.") + parser_create.add_argument('package', + help="package name") + parser_create.add_argument('version', + help="package version") + parser_create.add_argument('--log', + help="the log entry", + nargs='+') + parser_create.add_argument('--force', help="force creation of file. Overwrite existing file.", + default=False, action='store_const', + const=True) + + parser_new = subparser.add_parser('new', + help="new changelog entry") + parser_new.add_argument('version', + help="new version") + parser_new.add_argument('--log', + help="the log entry", + nargs='+') + + parser_test = subparser.add_parser('test', help="test cswch") + + return parser.parse_args() + + +if __name__ == '__main__': + cmdline = cmdline_parse() + + if cmdline.command == "test": + # cheat unittest into thinking that there are no command line + # arguments. + del sys.argv[1:] + unittest.main() + + if cmdline.command == "create": + create_changelog_file(cmdline.logfile, + cmdline.force, + cmdline.package, + cmdline.version, + cmdline.log) + + if cmdline.command == "new": + new_changelog_entry(cmdline.logfile, + cmdline.version, + cmdline.log) Property changes on: csw/mgar/gar/v2/bin/cswch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property 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 Apr 22 00:33:46 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 21 Apr 2014 22:33:46 +0000 Subject: SF.net SVN: gar:[23454] csw/mgar/pkg/sasl/trunk Message-ID: <3gCN491DT7z1Tt@mail.opencsw.org> Revision: 23454 http://sourceforge.net/p/gar/code/23454 Author: chninkel Date: 2014-04-21 22:33:45 +0000 (Mon, 21 Apr 2014) Log Message: ----------- sasl/trunk: revert libsasl soname Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2014-04-21 21:14:28 UTC (rev 23453) +++ csw/mgar/pkg/sasl/trunk/Makefile 2014-04-21 22:33:45 UTC (rev 23454) @@ -40,15 +40,27 @@ # it's not the case PATCHFILES += 0003-remove-gethostname-re-definition-on-sun.patch + +# Like Debian, we don't follow upstream soname bump as: +# - the ABI breakage was already done since 2.1.23 and didn't break anything, +# - the only impact would have been on openldap and it is handled on that side +# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628237 +# and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665476 +PATCHFILES += 0045_revert_upstream_soname_bump.patch + + VENDOR_URL = http://asg.web.cmu.edu/sasl/ PACKAGES += CSWsasl SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48 -RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-3 -CHECKPKG_OVERRIDES_CSWsasl += surplus-dependency|CSWlibsasl2-3 +RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 +CHECKPKG_OVERRIDES_CSWsasl += surplus-dependency|CSWlibsasl2-2 +CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWlibmysqlclient18 + + # The sasl package contains the sasl modules which are .so files # This is normal even if it's not a developement package CHECKPKG_OVERRIDES_CSWsasl += shared-lib-package-contains-so-symlink @@ -77,7 +89,7 @@ CATALOGNAME_CSWsaslgssapi = sasl_gssapi SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl -RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibkrb5-3 CHECKPKG_OVERRIDES_CSWsaslgssapi += catalogname-does-not-match-pkgname|pkgname=CSWsaslgssapi|catalogname=sasl_gssapi|expected-catalogname=saslgssapi PKGFILES_CSWsaslgssapi = $(call pkgfiles_lib,sasl2/libgs2.so) PKGFILES_CSWsaslgssapi += $(call pkgfiles_lib,sasl2/libgssapiv2.so) @@ -96,14 +108,14 @@ CHECKPKG_OVERRIDES_CSWsaslsql += catalogname-does-not-match-pkgname|pkgname=CSWsaslsql|catalogname=sasl_sql|expected-catalogname=saslsql PKGFILES_CSWsaslsql = $(call pkgfiles_lib,sasl2/libsql.so) -PACKAGES += CSWlibsasl2-3 -SPKG_DESC_CSWlibsasl2-3 = Simple authentication and security layer library, libsasl2.so.2 -PKGFILES_CSWlibsasl2-3 += $(call pkgfiles_lib,libsasl2.so.3) +PACKAGES += CSWlibsasl2-2 +SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2 +PKGFILES_CSWlibsasl2-2 += $(call pkgfiles_lib,libsasl2.so.2) PACKAGES += CSWsasl-dev SPKG_DESC_CSWsasl-dev = Development files for SASL PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-3 +RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWsasl-dev += CSWsasl @@ -111,8 +123,8 @@ CATALOGNAME_CSWsaslsample = sasl_sample SPKG_DESC_CSWsaslsample = Cyrus Simple Authentication and Security Layer sample client/server RUNTIME_DEP_PKGS_CSWsaslsample = CSWsasl -RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-3 -RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibkrb5-3 PKGFILES_CSWsaslsample = $(bindir)/sasl-sample-server PKGFILES_CSWsaslsample += $(bindir)/sasl-sample-client # The plugins of CSWsasl are needed, else the functionality Added: csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch =================================================================== --- csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch (rev 0) +++ csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch 2014-04-21 22:33:45 UTC (rev 23454) @@ -0,0 +1,46 @@ +Author: Roberto C. Sanchez +Description: Revert upstream's SONAME bump, which was introduced in upstream version 2.1.26. SONAME breakage was previously handled in Debian and a bump is not required at this time. +--- cyrus-sasl2.git.orig/lib/Makefile.am ++++ cyrus-sasl2.git/lib/Makefile.am +@@ -43,7 +43,7 @@ + # Library version info - here at the top, for sanity + # See + # CURRENT:REVISION:AGE +-sasl_version = 3:0:0 ++sasl_version = 2:25:0 + + INCLUDES=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + +--- cyrus-sasl2.git.orig/lib/Makefile.in ++++ cyrus-sasl2.git/lib/Makefile.in +@@ -319,7 +319,7 @@ + # Library version info - here at the top, for sanity + # See + # CURRENT:REVISION:AGE +-sasl_version = 3:0:0 ++sasl_version = 2:25:0 + INCLUDES = -DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a +--- cyrus-sasl2.git.orig/plugins/Makefile.am ++++ cyrus-sasl2.git/plugins/Makefile.am +@@ -47,7 +47,7 @@ + # Library version info - here at the top, for sanity + # See + # CURRENT:REVISION:AGE +-plugin_version = 3:0:0 ++plugin_version = 2:25:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) +--- cyrus-sasl2.git.orig/plugins/Makefile.in ++++ cyrus-sasl2.git/plugins/Makefile.in +@@ -362,7 +362,7 @@ + # Library version info - here at the top, for sanity + # See + # CURRENT:REVISION:AGE +-plugin_version = 3:0:0 ++plugin_version = 2:25:0 + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ 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 Apr 22 01:14:59 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 23:14:59 +0000 Subject: SF.net SVN: gar:[23455] csw/mgar/pkg Message-ID: <3gCNzg4mJsz2w@mail.opencsw.org> Revision: 23455 http://sourceforge.net/p/gar/code/23455 Author: wahwah Date: 2014-04-21 23:14:56 +0000 (Mon, 21 Apr 2014) Log Message: ----------- gtk/trunk: Package split Added Paths: ----------- csw/mgar/pkg/gtk/ csw/mgar/pkg/gtk/Makefile csw/mgar/pkg/gtk/branches/ csw/mgar/pkg/gtk/tags/ csw/mgar/pkg/gtk/trunk/ csw/mgar/pkg/gtk/trunk/Makefile csw/mgar/pkg/gtk/trunk/checksums csw/mgar/pkg/gtk/trunk/files/ Added: csw/mgar/pkg/gtk/Makefile =================================================================== --- csw/mgar/pkg/gtk/Makefile (rev 0) +++ csw/mgar/pkg/gtk/Makefile 2014-04-21 23:14:56 UTC (rev 23455) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gtk/trunk =================================================================== --- csw/mgar/pkg/gtk/trunk 2014-04-21 22:33:45 UTC (rev 23454) +++ csw/mgar/pkg/gtk/trunk 2014-04-21 23:14:56 UTC (rev 23455) Property changes on: csw/mgar/pkg/gtk/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gtk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtk/trunk/Makefile 2014-04-21 23:14:56 UTC (rev 23455) @@ -0,0 +1,46 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gtk+ +VERSION = 1.2.10 +GARTYPE = v2 + +DESCRIPTION = GIMP Toolkit, for creating graphical user interfaces + +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gtk+/1.2/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64_LIB_ONLY = 1 + +PACKAGES += CSWlibgdk1-2-0 +PKGFILES_CSWlibgdk1-2-0 += $(call baseisadirs,$(libdir),libgdk-1\.2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgdk1-2-0 += $(DESCRIPTION), libgdk-1.2.so.0 +RUNTIME_DEP_PKGS_CSWlibgdk1-2-0 += CSWlibglib1-2-0 +OBSOLETED_BY_CSWlibgdk1-2-0 = CSWgtk + +PACKAGES += CSWlibgtk1-2-0 +PKGFILES_CSWlibgtk1-2-0 += $(call baseisadirs,$(libdir),libgtk-1\.2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgtk1-2-0 += $(DESCRIPTION), libgtk-1.2.so.0 +RUNTIME_DEP_PKGS_CSWlibgtk1-2-0 += CSWlibgmodule1-2-0 +RUNTIME_DEP_PKGS_CSWlibgtk1-2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgtk1-2-0 += CSWlibglib1-2-0 +OBSOLETED_BY_CSWlibgtk1-2-0 = CSWgtk + +PACKAGES += CSWgtk-dev +SPKG_DESC_CSWgtk-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWgtk-dev += CSWlibgtk1-2-0 +RUNTIME_DEP_PKGS_CSWgtk-dev += CSWperl +RUNTIME_DEP_PKGS_CSWgtk-dev += CSWlibgdk1-2-0 + +# There are .el and .pl files there, but we don't necessarily want to install +# Perl and/or Emacs because of that. +CHECKPKG_OVERRIDES_CSWgtk-dev += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWgtk-dev += missing-dependency|CSWemacs-common + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/gtk/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gtk/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtk/trunk/checksums 2014-04-21 23:14:56 UTC (rev 23455) @@ -0,0 +1 @@ +4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Apr 22 01:22:32 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 21 Apr 2014 23:22:32 +0000 Subject: SF.net SVN: gar:[23456] csw/mgar/pkg/tor Message-ID: <3gCP8P6DCVz6F@mail.opencsw.org> Revision: 23456 http://sourceforge.net/p/gar/code/23456 Author: jake_goerzen Date: 2014-04-21 23:22:28 +0000 (Mon, 21 Apr 2014) Log Message: ----------- initial commit of tor alpha (development) relese Added Paths: ----------- csw/mgar/pkg/tor/branches/ csw/mgar/pkg/tor/branches/alpha/ csw/mgar/pkg/tor/branches/alpha/Makefile csw/mgar/pkg/tor/branches/alpha/checksums csw/mgar/pkg/tor/branches/alpha/files/ csw/mgar/pkg/tor/branches/alpha/files/README.CSW csw/mgar/pkg/tor/branches/alpha/files/cswtor Removed Paths: ------------- csw/mgar/pkg/tor/branches/ Added: csw/mgar/pkg/tor/branches/alpha/Makefile =================================================================== --- csw/mgar/pkg/tor/branches/alpha/Makefile (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/Makefile 2014-04-21 23:22:28 UTC (rev 23456) @@ -0,0 +1,51 @@ +# $Id: Makefile 23124 2014-03-03 23:36:01Z jake_goerzen $ +NAME = tor +VERSION = 0.2.5.3-alpha +GARTYPE = v2 + +DESCRIPTION = Secure network traffic router +define BLURB +Basically tor provides a distributed network of servers (onion routers). Users bounce their TCP streams (web traffic, ftp, ssh, etc) around the routers, and recipients, observers, and even the routers themselves have difficulty tracking the source of the stream. +endef + +MASTER_SITES = http://www.torproject.org/dist/ +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.torproject.org +LICENSE = LICENSE + +RUNTIME_DEP_PKGS_CSWtor += CSWlibevent2-0-5 +RUNTIME_DEP_PKGS_CSWtor += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWtor += CSWlibz1 + +sysconfdir = /etc/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_PAX_ARGS = -s ',/torrc\.sample,/torrc.CSW,p' + +PRESERVECONF += $(sysconfdir)/tor/tor-tsocks.conf +PRESERVECONF += $(sysconfdir)/tor/torrc + +MIGRATE_FILES += tor/tor-tsocks.conf +MIGRATE_FILES += tor/torrc + +INITSMF = /etc/opt/csw/init.d/cswtor + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +include gar/category.mk + +post-install-modulated: + + # Copy SMF script + ginstall -Dm 755 $(FILEDIR)/cswtor \ + $(DESTDIR)/etc/opt/csw/init.d/cswtor + + # Copy README.CSW to docs + ginstall -m 444 $(FILEDIR)/README.CSW \ + $(DESTDIR)/opt/csw/share/doc/tor/ + + @$(MAKECOOKIE) Added: csw/mgar/pkg/tor/branches/alpha/checksums =================================================================== --- csw/mgar/pkg/tor/branches/alpha/checksums (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/checksums 2014-04-21 23:22:28 UTC (rev 23456) @@ -0,0 +1 @@ +8714ea9ceaa7477534c88385edfdf7df tor-0.2.5.3-alpha.tar.gz Added: csw/mgar/pkg/tor/branches/alpha/files/README.CSW =================================================================== --- csw/mgar/pkg/tor/branches/alpha/files/README.CSW (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/files/README.CSW 2014-04-21 23:22:28 UTC (rev 23456) @@ -0,0 +1,3 @@ +NOTE: This is a system level instance of Tor which may not be the most secure way to implement Tor. You should read the Tor documentation and understand the security implications of running a system level Tor before depending on this method for anonymity. + +https://www.torproject.org/docs/documentation.html Added: csw/mgar/pkg/tor/branches/alpha/files/cswtor =================================================================== --- csw/mgar/pkg/tor/branches/alpha/files/cswtor (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/files/cswtor 2014-04-21 23:22:28 UTC (rev 23456) @@ -0,0 +1,30 @@ +#!/bin/sh + +#FMRI network + +DAEMON=/opt/csw/bin/tor +CONF=/etc/opt/csw/tor/torrc +pidfile=/var/opt/csw/run/tor.pid + +case "$1" in + start) + echo "Starting Tor" + $DAEMON --RunAsDaemon 1 --PidFile /var/opt/csw/run/tor.pid + ;; + stop) + echo "Stopping Tor" + kill `cat $pidfile` + ;; + restart) + echo "Restarting Tor" + kill `cat $pidfile` + sleep 1 + $DAEMON --RunAsDaemon 1 --PidFile /var/opt/csw/run/tor.pid + ;; + *) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 22 01:42:13 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 23:42:13 +0000 Subject: SF.net SVN: gar:[23457] csw/mgar/pkg/fakeroot/trunk Message-ID: <3gCPb510yYz9y@mail.opencsw.org> Revision: 23457 http://sourceforge.net/p/gar/code/23457 Author: wahwah Date: 2014-04-21 23:42:11 +0000 (Mon, 21 Apr 2014) Log Message: ----------- fakeroot/trunk: Package split Modified Paths: -------------- csw/mgar/pkg/fakeroot/trunk/Makefile csw/mgar/pkg/fakeroot/trunk/checksums Modified: csw/mgar/pkg/fakeroot/trunk/Makefile =================================================================== --- csw/mgar/pkg/fakeroot/trunk/Makefile 2014-04-21 23:22:28 UTC (rev 23456) +++ csw/mgar/pkg/fakeroot/trunk/Makefile 2014-04-21 23:42:11 UTC (rev 23457) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = fakeroot -VERSION = 1.12.4 +VERSION = 1.20 GARTYPE = v2 DESCRIPTION = A fake root environment by means of LD_PRELOAD and SYSV IPC (or TCP) trickery. @@ -9,24 +9,28 @@ endef MASTER_SITES = http://ftp.debian.org/debian/pool/main/f/fakeroot/ -DISTFILES = $(NAME)_$(VERSION).tar.gz +DISTFILES = $(NAME)_$(VERSION).orig.tar.bz2 -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(NAME)_(\d+(?:\.\d+)*).orig.tar.bz2 -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +TEST_SCRIPTS = +PACKAGES += CSWlibfakeroot0 +PKGFILES_CSWlibfakeroot0 += $(call baseisadirs,$(libdir),libfakeroot-0\.so(\.\d+)*) +SPKG_DESC_CSWlibfakeroot0 += $(DESCRIPTION), libfakeroot-0.so +RUNTIME_DEP_PKGS_CSWfakeroot += CSWlibfakeroot0 +# At least they have the "0" in the soname. +CHECKPKG_OVERRIDES_CSWlibfakeroot0 += soname-equals-filename|file=/opt/csw/lib/libfakeroot-0.so + +PACKAGES += CSWfakeroot +SPKG_DESC_CSWfakeroot += $(DESCRIPTION) + include gar/category.mk # The ACL implemenatation in fakeroot doesn't work on solaris so remove it pre-configure-modulated: @( cd $(WORKSRC); gsed -i -e 's%sys/acl.h%%' configure.ac; \ - autoreconf ) - @$(MAKECOOKIE) - + mkdir build-aux; autoreconf -fi ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/fakeroot/trunk/checksums =================================================================== --- csw/mgar/pkg/fakeroot/trunk/checksums 2014-04-21 23:22:28 UTC (rev 23456) +++ csw/mgar/pkg/fakeroot/trunk/checksums 2014-04-21 23:42:11 UTC (rev 23457) @@ -1 +1 @@ -aaefede2405a40c87438e7e833d69b70 fakeroot_1.12.4.tar.gz +9777a81d4d1878422447a1d0030c1f9f fakeroot_1.20.orig.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 22 01:49:41 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 23:49:41 +0000 Subject: SF.net SVN: gar:[23458] csw/mgar/pkg/fakeroot/trunk Message-ID: <3gCPlh0dkHzLK@mail.opencsw.org> Revision: 23458 http://sourceforge.net/p/gar/code/23458 Author: wahwah Date: 2014-04-21 23:49:40 +0000 (Mon, 21 Apr 2014) Log Message: ----------- fakeroot/trunk: Added changelog Modified Paths: -------------- csw/mgar/pkg/fakeroot/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW Modified: csw/mgar/pkg/fakeroot/trunk/Makefile =================================================================== --- csw/mgar/pkg/fakeroot/trunk/Makefile 2014-04-21 23:42:11 UTC (rev 23457) +++ csw/mgar/pkg/fakeroot/trunk/Makefile 2014-04-21 23:49:40 UTC (rev 23458) @@ -1,4 +1,4 @@ -# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +# $Id$ NAME = fakeroot VERSION = 1.20 GARTYPE = v2 Added: csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW 2014-04-21 23:49:40 UTC (rev 23458) @@ -0,0 +1,6 @@ +fakeroot (1.20,REV=2014.04.22) + + * Garification, package split. + + -- Maciej Blizinski Tue, 22 Apr 2014 01:46:09 +0200 + 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 Apr 22 01:59:00 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Apr 2014 23:59:00 +0000 Subject: SF.net SVN: gar:[23459] csw/mgar/pkg/fakeroot/trunk Message-ID: <3gCPyQ4d4hzPk@mail.opencsw.org> Revision: 23459 http://sourceforge.net/p/gar/code/23459 Author: wahwah Date: 2014-04-21 23:58:58 +0000 (Mon, 21 Apr 2014) Log Message: ----------- fakeroot/trunk: Build for Solaris 9 Modified Paths: -------------- csw/mgar/pkg/fakeroot/trunk/Makefile csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW Modified: csw/mgar/pkg/fakeroot/trunk/Makefile =================================================================== --- csw/mgar/pkg/fakeroot/trunk/Makefile 2014-04-21 23:49:40 UTC (rev 23458) +++ csw/mgar/pkg/fakeroot/trunk/Makefile 2014-04-21 23:58:58 UTC (rev 23459) @@ -13,6 +13,8 @@ UFILES_REGEX = $(NAME)_(\d+(?:\.\d+)*).orig.tar.bz2 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW 2014-04-21 23:49:40 UTC (rev 23458) +++ csw/mgar/pkg/fakeroot/trunk/files/changelog.CSW 2014-04-21 23:58:58 UTC (rev 23459) @@ -1,6 +1,6 @@ fakeroot (1.20,REV=2014.04.22) - * Garification, package split. + * Garification, package split, build on Solaris 9. -- Maciej Blizinski Tue, 22 Apr 2014 01:46:09 +0200 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 Apr 22 09:47:24 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Apr 2014 07:47:24 +0000 Subject: SF.net SVN: gar:[23460] csw/mgar/pkg/subversion/trunk Message-ID: <3gCcLs5fvzztY@mail.opencsw.org> Revision: 23460 http://sourceforge.net/p/gar/code/23460 Author: dmichelsen Date: 2014-04-22 07:47:21 +0000 (Tue, 22 Apr 2014) Log Message: ----------- subversion/trunk: Remove notice about incompatible 1.4 update Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/CSWsvn.checkinstall Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2014-04-21 23:58:58 UTC (rev 23459) +++ csw/mgar/pkg/subversion/trunk/Makefile 2014-04-22 07:47:21 UTC (rev 23460) @@ -31,7 +31,6 @@ MASTER_SITES = http://archive.apache.org/dist/subversion/ DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW Deleted: csw/mgar/pkg/subversion/trunk/files/CSWsvn.checkinstall =================================================================== --- csw/mgar/pkg/subversion/trunk/files/CSWsvn.checkinstall 2014-04-21 23:58:58 UTC (rev 23459) +++ csw/mgar/pkg/subversion/trunk/files/CSWsvn.checkinstall 2014-04-22 07:47:21 UTC (rev 23460) @@ -1,19 +0,0 @@ - -cat <<_EOT_ - -!! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! - -Using /opt/csw/bin/svn installed by this package with existing working copies -will automatically upgrade those working copies to the new 1.4.0 format. This -is *not* a reversable upgrade. Any working copies created by svn 1.4.0 will -*not* be accessible by 1.3.x clients. Note that this applies to working -copies only -- the repository itself is unaffected. - -Pausing for 5 seconds -- Ctrl-C to abort upgrade. - -!! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! - -_EOT_ - -sleep 5 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 22 10:57:39 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Apr 2014 08:57:39 +0000 Subject: SF.net SVN: gar:[23461] csw/mgar/pkg/ruby18/trunk Message-ID: <3gCdw040Mzz17D@mail.opencsw.org> Revision: 23461 http://sourceforge.net/p/gar/code/23461 Author: dmichelsen Date: 2014-04-22 08:57:37 +0000 (Tue, 22 Apr 2014) Log Message: ----------- ruby18/trunk: Reenable RubyTk by reverting r22977 and r22978 Revision Links: -------------- http://sourceforge.net/p/gar/code/22977 http://sourceforge.net/p/gar/code/22978 Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2014-04-22 07:47:21 UTC (rev 23460) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2014-04-22 08:57:37 UTC (rev 23461) @@ -9,11 +9,11 @@ TEST_SCRIPTS = TEST_ARGS = test-all -BUILD_DEP_PKGS = CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev +BUILD_DEP_PKGS = CSWbdb48devel CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibz-dev CSWlibssl-dev BUILD_DEP_PKGS += CSWlibncurses-dev -PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-dev CSWruby18-mode +PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode PACKAGES += CSWruby18-mode-el CSWlibruby18-1 CSWruby18-gcc4 EXTRA_MODULATORS = COMPILER @@ -23,6 +23,7 @@ OBSOLETED_BY_CSWruby18 = CSWruby OBSOLETED_BY_CSWruby18-doc = CSWrubydoc +OBSOLETED_BY_CSWruby18-tk = CSWrubytk OBSOLETED_BY_CSWruby18-dev = CSWrubydev OBSOLETED_BY_CSWruby18-mode = CSWrubymode OBSOLETED_BY_CSWruby18-mode-el = CSWrubymodeel @@ -40,7 +41,7 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby18 = CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibreadline6 CSWlibz1 @@ -48,11 +49,13 @@ RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18 +RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby18-1 + RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby18-1 CSWcoreutils -RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacs-common +RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacscommon -RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacs-common +RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacscommon DESCRIPTION = An object-oriented language for quick and easy programming. define BLURB @@ -73,6 +76,8 @@ SPKG_DESC_CSWruby18-doc = Documentation for Ruby 1.8 +SPKG_DESC_CSWruby18-tk = Ruby 1.8 Tcl/TK Extension + SPKG_DESC_CSWruby18-dev = Ruby 1.8 Extension Development Files SPKG_DESC_CSWruby18-mode = Ruby 1.8 major mode for Emacs @@ -83,6 +88,8 @@ PKGFILES_CSWruby18-gcc4 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/.*gcc4 +PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb + PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.*.so @@ -90,8 +97,6 @@ PKGFILES_CSWruby18-mode-el = $(datadir)/emacs/site-lisp/.*el$ -EXTRA_PKGFILES_EXCLUDED_CSWruby18 += $(libdir)/ruby/1.8/test/unit/ui/tk/.* - PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1 PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1.* @@ -104,7 +109,7 @@ DISTFILES = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2 DISTFILES += CSWruby.cswreleasenotes -DISTFILES += CSWrubydoc.cswreleasenotes +DISTFILES += CSWrubydoc.cswreleasenotes CSWrubytk.cswreleasenotes # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698 PATCHFILES = rdoc_parse_order_fix.patch @@ -116,6 +121,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --program-suffix=18 +# Needed for conformity with Tk +CONFIGURE_ARGS += --enable-pthread EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc INSTALL_ARGS = install @@ -180,7 +187,7 @@ @echo "Copying in sample code..." @mkdir -p $(PKGROOT)$(docdir)/ruby18/ @cp -R $(WORKSRC_FIRSTMOD)/sample $(PKGROOT)$(docdir)/ruby18/ - @for ext in bigdecimal dl; do \ + @for ext in bigdecimal dl tk ; do \ cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample \ $(PKGROOT)$(docdir)/ruby18/sample/$$ext ; \ done Copied: csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes (from rev 19644, csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes) =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes (rev 0) +++ csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes 2014-04-22 08:57:37 UTC (rev 23461) @@ -0,0 +1,2 @@ +* /usr/share reference in dialog.rb is in a comment +* /usr/local references are both in comments 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 Apr 22 11:08:54 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Apr 2014 09:08:54 +0000 Subject: SF.net SVN: gar:[23462] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: <3gCf8t6xk7z1C5@mail.opencsw.org> Revision: 23462 http://sourceforge.net/p/gar/code/23462 Author: dmichelsen Date: 2014-04-22 09:08:45 +0000 (Tue, 22 Apr 2014) Log Message: ----------- ruby18/trunk: Adjust for new package names Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2014-04-22 08:57:37 UTC (rev 23461) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2014-04-22 09:08:45 UTC (rev 23462) @@ -41,7 +41,7 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWruby18 = CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibreadline6 CSWlibz1 @@ -49,13 +49,13 @@ RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18 -RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWlibtk8-5 CSWlibtcl8-5 CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby18-1 CSWcoreutils -RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacscommon +RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacs-common -RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacscommon +RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacs-common DESCRIPTION = An object-oriented language for quick and easy programming. define BLURB @@ -90,6 +90,11 @@ PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb +# These are samples and comments +CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itk/setup.rb +CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itcl/setup.rb +CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb + PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.*.so 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 Apr 22 11:23:06 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Apr 2014 09:23:06 +0000 Subject: SF.net SVN: gar:[23463] csw/mgar/pkg/lang-python/python/branches/python-3.4 Message-ID: <3gCfTQ0h4Jz1Gw@mail.opencsw.org> Revision: 23463 http://sourceforge.net/p/gar/code/23463 Author: wahwah Date: 2014-04-22 09:23:01 +0000 (Tue, 22 Apr 2014) Log Message: ----------- lang-python/python/branches/python-3.4: Module compilation fails with ld: fatal: use the -z help option for usage information Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff Modified: csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile 2014-04-22 09:08:45 UTC (rev 23462) +++ csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile 2014-04-22 09:23:01 UTC (rev 23463) @@ -1,12 +1,12 @@ # $Id$ NAME = Python -VERSION = 3.3.2 -VER = 3.3 -DVER = 3-3 -UVER = 3_3 +VERSION = 3.4.0 +VER = 3.4 +DVER = 3-4 +UVER = 3_4 PVER = python$(VER) -CVER = 33 +CVER = 34 # Known issues: # @@ -34,13 +34,13 @@ UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ UFILES_REGEX = $(VER)\.\d+ -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz # Patches -PATCHFILES += makesetup.diff -PATCHFILES += modules.diff -PATCHFILES += multiprocess.diff -PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch +# PATCHFILES += makesetup.diff +# PATCHFILES += modules.diff +# PATCHFILES += multiprocess.diff +# PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch PATCHFILES += 0005-Use-opt-csw-lib-for-module-search.patch PATCHFILES += 0007-Settings-for-Solaris.patch @@ -53,9 +53,9 @@ # Installation paths are defined in: # http://hg.python.org/cpython/file/26588b6a39d9/Makefile.pre.in#l114 # http://wiki.debian.org/Python/MultiArch -# GARFLAVOR = DBG -# BUILD64 = 1 -# ISAEXEC = 1 +GARFLAVOR = DBG +BUILD64 = 1 +ISAEXEC = 1 # There is a file name conflict over libffi.so symlink between libffi package # and a gcc-java package. While it will ultimately belong to libffi_dev, the @@ -69,6 +69,11 @@ EXTRA_COMMON_EXPORTS = BASECFLAGS EXTRA_LINKER_FLAGS = -lsocket -lresolv -lrt +# Otherwise function wcschar has a different prototype from what Python source +# expects. +CPPFLAGS = -D_XPG5 +EXTRA_COMMON_EXPORTS = CPPFLAGS + NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared @@ -211,8 +216,13 @@ EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python +MACHDEP = $(ISA) +EXTRA_CONFIGURE_EXPORTS += MACHDEP + GARCOMPILER = GNU +LINKER_IGNORE = + include gar/category.mk # There is a file name conflict over libffi.so symlink between libffi package @@ -221,6 +231,5 @@ # pkgchk -L CSWlibffi-dev # (...) # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -# EXTRA_LINKER_FLAGS += $(libdir)/ffi +# EXTRA_LINKER_FLAGS += -L$(libdir)/ffi # LDFLAGS += -L$(libdir)/ffi - Modified: csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums 2014-04-22 09:08:45 UTC (rev 23462) +++ csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums 2014-04-22 09:23:01 UTC (rev 23463) @@ -1 +1 @@ -7dffe775f3bea68a44f762a3490e5e28 Python-3.3.2.tar.bz2 +77c22725e14af3d71022cbfdebff4903 Python-3.4.0.tar.xz Deleted: csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff 2014-04-22 09:08:45 UTC (rev 23462) +++ csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff 2014-04-22 09:23:01 UTC (rev 23463) @@ -1,77 +0,0 @@ ---- Python-2.6.2/Lib/site.py.o 2009-05-16 10:26:13.235499624 -0500 -+++ Python-2.6.2/Lib/site.py 2009-05-16 10:29:16.772710013 -0500 -@@ -266,9 +266,10 @@ - sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': - sitedirs.append(os.path.join(prefix, "lib", -- "python" + sys.version[:3], -+ "python", - "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-python")) -+ sitedirs.append("/opt/csw/lib/python2.3/site-packages") - else: - sitedirs.append(prefix) - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) ---- Python-2.6.2/Lib/distutils/command/install.py.o 2009-05-16 10:29:46.625564211 -0500 -+++ Python-2.6.2/Lib/distutils/command/install.py 2009-05-16 10:31:26.296866583 -0500 -@@ -41,8 +41,8 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib/python/site-packages', -+ 'platlib': '$platbase/lib/python/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- Python-2.6.2/Makefile.pre.in.o 2009-05-16 10:35:14.566752156 -0500 -+++ Python-2.6.2/Makefile.pre.in 2009-05-16 10:35:55.162080324 -0500 -@@ -94,11 +94,11 @@ - SCRIPTDIR= $(prefix)/lib - - # Detailed destination directories --BINLIBDEST= $(LIBDIR)/python$(VERSION) --LIBDEST= $(SCRIPTDIR)/python$(VERSION) -+BINLIBDEST= $(LIBDIR)/python -+LIBDEST= $(SCRIPTDIR)/python - INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) - CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) --LIBP= $(LIBDIR)/python$(VERSION) -+LIBP= $(LIBDIR)/python - - # Symbols used for using shared libraries - SO= @SO@ ---- Python-2.6.2/Modules/getpath.c.o 2009-05-16 10:44:29.756720713 -0500 -+++ Python-2.6.2/Modules/getpath.c 2009-05-16 10:45:33.735370122 -0500 -@@ -117,8 +117,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib/python:" \ -+ EXEC_PREFIX "/lib/python/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -129,7 +129,7 @@ - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib/python"; - - static void - reduce(char *dir) ---- Python-2.6.2/Lib/distutils/sysconfig.py.o 2009-05-16 10:48:24.271739485 -0500 -+++ Python-2.6.2/Lib/distutils/sysconfig.py 2009-05-16 10:49:21.413202445 -0500 -@@ -116,7 +116,7 @@ - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "lib", "python") - if standard_lib: - return libpython - else: 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 Apr 22 11:39:52 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Apr 2014 09:39:52 +0000 Subject: SF.net SVN: gar:[23464] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: <3gCfrc5J6szl@mail.opencsw.org> Revision: 23464 http://sourceforge.net/p/gar/code/23464 Author: dmichelsen Date: 2014-04-22 09:39:49 +0000 (Tue, 22 Apr 2014) Log Message: ----------- ruby18/trunk: Files during install-phase must go to DESTDIR Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2014-04-22 09:23:01 UTC (rev 23463) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2014-04-22 09:39:49 UTC (rev 23464) @@ -175,7 +175,7 @@ cp $(DESTDIR)$(RBCONFIG).$(COMPILER) \ $(PKGROOT)$(RBCONFIG).$(COMPILER) ) -post-install-modulated: RMDIR=$(PKGROOT)/$(datadir)/emacs/site-lisp/ruby-mode +post-install-modulated: RMDIR=$(DESTDIR)$(datadir)/emacs/site-lisp/ruby-mode post-install-modulated: @echo "Stripping DESTDIR from rbconfig.rb" @gsed -i -e s,$(DESTDIR),, \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Apr 22 12:19:49 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 22 Apr 2014 10:19:49 +0000 Subject: SF.net SVN: gar:[23465] csw/mgar/gar/v2/bin/cswch Message-ID: <3gCgkm4lPXz6R@mail.opencsw.org> Revision: 23465 http://sourceforge.net/p/gar/code/23465 Author: guengel Date: 2014-04-22 10:19:47 +0000 (Tue, 22 Apr 2014) Log Message: ----------- bin/cswch: added 'version' command, which extracts the latest version from changelog.CSW. Started working on ChangeLogEntry class. Modified Paths: -------------- csw/mgar/gar/v2/bin/cswch Modified: csw/mgar/gar/v2/bin/cswch =================================================================== --- csw/mgar/gar/v2/bin/cswch 2014-04-22 09:39:49 UTC (rev 23464) +++ csw/mgar/gar/v2/bin/cswch 2014-04-22 10:19:47 UTC (rev 23465) @@ -1,8 +1,21 @@ #!/usr/bin/env python -""" -Maintain OpenCSW changelog +"""Maintain OpenCSW changelog. +The changelog files generated are modeled after the Debian changelog + + http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog + +except that the header line for each entry is somewhat +simplyfied. Instead of using + + package (version) distribution(s); urgency=urgency + +it uses + + package (version,REV=revision) + $Id$ + """ import argparse import datetime @@ -290,7 +303,7 @@ :param dt: datetime object or none, in which case the current time will be taken. - + """ if date_obj is None: timezone = dateutil.tz.tzlocal() @@ -381,6 +394,67 @@ whitespace_re = r'\s{2,}|\n+' whitespace_re_c = re.compile(whitespace_re) + +class ChangeLogEntry(object): + """A ChangeLogEntry + + A ChangeLogEntry is comprised of a ChangeLogHeader, + ChangeLogFooter, and one or more ChangeLogParagraph's. + + """ + + def __init__(self): + self.paragaphs = list() + + def add_header(self, cl_header): + """Add a ChangeLog Entry header. + + Add or replace the ChangeLog Entry header. + + """ + assert cl_header is not None + self.header = cl_header + + def add_footer(self, cl_footer): + """Add a ChangeLog Entry footer. + + Add or replace the ChangeLog Entry footer. + + """ + assert cl_footer is not None + self.footer = cl_footer + + def add_paragraph(self, cl_paragraph, infront=True): + """Add a ChangeLog Entry paragraph. + + Add another ChangeLog Entry paragraph. + + If :param infront: is True, the paragraph will be prepended to + the paragraph list. Else it will be appended. + + """ + assert cl_paragraph is not None + + if infront: + self.paragraphs.insert(0, cl_pargraph) + else: + self.paragraphs.append(cl_paragraph) + + def remove_paragraph(self, index): + """Remove a ChangeLog paragraph + + Remove a ChangeLog paragraph from the list of paragraphs. The + removed paragraph will be returned to the caller. + + """ + chlogp = self.paragraphs[index] + del self.paragraphs[index] + return chlogp + + def __str__(self): + pass + + def slurpin_changelog(filename): """Load existing changelog""" @@ -401,7 +475,7 @@ if entry_start_re.match(line): entry_dict = {'header': ChangeLogHeader(line=line)} continue - + # is it the footer, and thus marks the end of a entry? if line.startswith(' -- '): # is there a paragraph pending? @@ -418,7 +492,7 @@ # append to the list changelog_entries.append(entry_dict) continue - + # is it the start of an entry paragraph? if line.startswith(' * '): # is the first item of the paragraph list a paragraph @@ -492,6 +566,17 @@ fobj.write(str(chlg_footer)) fobj.write('\n\n') + +def get_version(logfile, allversions): + chlg_entries = slurpin_changelog(logfile) + + if allversions: + for entry in chlg_entries: + print entry['header'].version + else: + print chlg_entries[0]['header'].version + + def cmdline_parse(): """Parse the command line @@ -526,6 +611,13 @@ help="the log entry", nargs='+') + parser_version = subparser.add_parser('version', + help="retrieve version from changelog.CSW") + parser_version.add_argument('--all-versions', + help="retrieve all versions", + default=False, action='store_const', + const=True) + parser_test = subparser.add_parser('test', help="test cswch") return parser.parse_args() @@ -551,3 +643,6 @@ new_changelog_entry(cmdline.logfile, cmdline.version, cmdline.log) + + if cmdline.command == "version": + get_version(cmdline.logfile, cmdline.all_versions) 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 Apr 22 22:46:36 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 20:46:36 +0000 Subject: SF.net SVN: gar:[23466] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: <3gCxf45wkJz10N@mail.opencsw.org> Revision: 23466 http://sourceforge.net/p/gar/code/23466 Author: chninkel Date: 2014-04-22 20:46:33 +0000 (Tue, 22 Apr 2014) Log Message: ----------- gnutls3/trunk: remove the devel stub package not used anymore Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-22 10:19:47 UTC (rev 23465) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-22 20:46:33 UTC (rev 23466) @@ -65,7 +65,6 @@ SPKG_DESC_CSWlibgnutls-dev = Development Files for GNU TLS PKGFILES_CSWlibgnutls-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls28 -OBSOLETED_BY_CSWlibgnutls-dev = CSWgnutlsdevel # The compilation complains with # "gets is a security hole - use fgets instead" 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 Apr 22 22:49:51 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 20:49:51 +0000 Subject: SF.net SVN: gar:[23467] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: <3gCxjh1fXlz141@mail.opencsw.org> Revision: 23467 http://sourceforge.net/p/gar/code/23467 Author: chninkel Date: 2014-04-22 20:49:48 +0000 (Tue, 22 Apr 2014) Log Message: ----------- gnutls3/trunk: remove the obsolete libgnutls13 dependency as gnutls is not used as a direct dependency anymore Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-22 20:46:33 UTC (rev 23466) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-22 20:49:48 UTC (rev 23467) @@ -36,11 +36,6 @@ SPKG_DESC_CSWgnutls = GNU Transport Layer Security Utility Programs RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWgnutls += CSWlibintl8 -# This is a dependency for legacy packages expecting to find libgnutls*.so.13 in CSWgnutls. -# CSWlibgnutls13 is built from a branch -RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls13 -CHECKPKG_OVERRIDES_CSWgnutls += unidentified-dependency|CSWlibgnutls13 -CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls13 CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls28 PACKAGES += CSWlibgnutls28 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 Apr 22 22:50:33 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 20:50:33 +0000 Subject: SF.net SVN: gar:[23468] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: <3gCxkT1GKyz17G@mail.opencsw.org> Revision: 23468 http://sourceforge.net/p/gar/code/23468 Author: chninkel Date: 2014-04-22 20:50:32 +0000 (Tue, 22 Apr 2014) Log Message: ----------- gnutls3/trunk: remove a checkpkg override that shouldn't be necessary Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-22 20:49:48 UTC (rev 23467) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2014-04-22 20:50:32 UTC (rev 23468) @@ -36,7 +36,6 @@ SPKG_DESC_CSWgnutls = GNU Transport Layer Security Utility Programs RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWgnutls += CSWlibintl8 -CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls28 PACKAGES += CSWlibgnutls28 CATALOGNAME_CSWlibgnutls = libgnutls28 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 Apr 22 22:58:42 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 20:58:42 +0000 Subject: SF.net SVN: gar:[23469] csw/mgar/pkg/screen/trunk Message-ID: <3gCxvx3MHwz1Bj@mail.opencsw.org> Revision: 23469 http://sourceforge.net/p/gar/code/23469 Author: chninkel Date: 2014-04-22 20:58:38 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: updated to 4.2.0 Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 20:50:32 UTC (rev 23468) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 20:58:38 UTC (rev 23469) @@ -1,5 +1,5 @@ NAME = screen -VERSION = 4.0.3 +VERSION = 4.2.0 GARTYPE = v2 DESCRIPTION = A window manager that multiplexes a physical terminal. @@ -12,7 +12,7 @@ endef VENDOR_URL = http://www.gnu.org/software/screen/ -MASTER_SITES = http://ftp.gnu.org/gnu/screen/ +MASTER_SITES = http://download.savannah.gnu.org/releases/screen/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += screenrc Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2014-04-22 20:50:32 UTC (rev 23468) +++ csw/mgar/pkg/screen/trunk/checksums 2014-04-22 20:58:38 UTC (rev 23469) @@ -1,5 +1 @@ -18269762c8dbe1443730d1e23fddfd0c changelog.CSW -8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz -ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch -3f25f108225cea31321046da5b033f6a screen-utmp.patch -f6c675685f3cfa25a43a1827c264b3f0 screenrc +e5199156a8ac863bbf92495a7638b612 screen-4.2.0.tar.gz Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 20:50:32 UTC (rev 23468) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 20:58:38 UTC (rev 23469) @@ -1,3 +1,9 @@ +screen (4.2.0,REV=2014.04.22) unstable + + * New upstream version. + + -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 + screen (4.0.3,REV=2012.08.24) unstable * Enabled symbols direct binding. 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 Apr 22 22:59:27 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 20:59:27 +0000 Subject: SF.net SVN: gar:[23470] csw/mgar/pkg/screen/trunk Message-ID: <3gCxwl3B2Sz1G1@mail.opencsw.org> Revision: 23470 http://sourceforge.net/p/gar/code/23470 Author: chninkel Date: 2014-04-22 20:59:26 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove obsolete stub package Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 20:58:38 UTC (rev 23469) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 20:59:26 UTC (rev 23470) @@ -31,16 +31,6 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -# Stub package that allow us to rename transparently the package -# from CSWscrn to CSWscreen -# We also include the postinstall code to migrate screen session from -# /tmp/screens|uscreens to /var/opt/csw/run/screens as we changed the -# screen socket dir path at the same time -OBSOLETED_BY_CSWscreen = CSWscrn -CATALOGNAME_CSWscrn = screen_stub -DISTFILES += CSWscrn.postinstall - SPKG_DESC_CSWscreen = A window manager that multiplexes a physical terminal. CATALOGNAME_CSWscreen = screen RUNTIME_DEP_PKGS_CSWscreen = CSWterminfo Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 20:58:38 UTC (rev 23469) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 20:59:26 UTC (rev 23470) @@ -1,6 +1,7 @@ screen (4.2.0,REV=2014.04.22) unstable * New upstream version. + * Removed screen_stub package. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Apr 22 23:10:10 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:10:10 +0000 Subject: SF.net SVN: gar:[23471] csw/mgar/pkg/screen/trunk Message-ID: <3gCy9B40dlz1Km@mail.opencsw.org> Revision: 23471 http://sourceforge.net/p/gar/code/23471 Author: chninkel Date: 2014-04-22 21:10:07 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove patch screen-maxwin.patch which has been applied upstream Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/screen/trunk/files/screen-maxwin.patch Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 20:59:26 UTC (rev 23470) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:10:07 UTC (rev 23471) @@ -49,10 +49,6 @@ # so we modify configure.in so ncurses is tried before curses # PATCHFILES += enable_ncurses.patch -# this patch increases the maximum number of simultaneously allowed -# windows per screen session. -PATCHFILES += screen-maxwin.patch - # screen is not installed with setuid bit so we disable utmp update PATCHFILES += screen-utmp.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 20:59:26 UTC (rev 23470) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:10:07 UTC (rev 23471) @@ -2,6 +2,7 @@ * New upstream version. * Removed screen_stub package. + * Removed patch screen-maxwin.patch which has been applied upstream. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 Deleted: csw/mgar/pkg/screen/trunk/files/screen-maxwin.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/screen-maxwin.patch 2014-04-22 20:59:26 UTC (rev 23470) +++ csw/mgar/pkg/screen/trunk/files/screen-maxwin.patch 2014-04-22 21:10:07 UTC (rev 23471) @@ -1,11 +0,0 @@ ---- screen-4.0.2-orig/config.h.in 2003-12-31 06:39:46.670063000 -0500 -+++ screen-4.0.2/config.h.in 2003-12-31 06:40:08.169992000 -0500 -@@ -35,7 +35,7 @@ - * Maximum of simultaneously allowed windows per screen session. - */ - #ifndef MAXWIN --# define MAXWIN 40 -+# define MAXWIN 100 - #endif - - /* 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 Apr 22 23:14:10 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:14:10 +0000 Subject: SF.net SVN: gar:[23472] csw/mgar/pkg/screen/trunk/files Message-ID: <3gCyFn0GGxz1P8@mail.opencsw.org> Revision: 23472 http://sourceforge.net/p/gar/code/23472 Author: chninkel Date: 2014-04-22 21:14:09 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: update patch screen-utmp.patch so that it can be applied on last upstream release Modified Paths: -------------- csw/mgar/pkg/screen/trunk/files/changelog.CSW csw/mgar/pkg/screen/trunk/files/screen-utmp.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:10:07 UTC (rev 23471) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:14:09 UTC (rev 23472) @@ -3,6 +3,7 @@ * New upstream version. * Removed screen_stub package. * Removed patch screen-maxwin.patch which has been applied upstream. + * Updated patch screen-utmp.patch. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 Modified: csw/mgar/pkg/screen/trunk/files/screen-utmp.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/screen-utmp.patch 2014-04-22 21:10:07 UTC (rev 23471) +++ csw/mgar/pkg/screen/trunk/files/screen-utmp.patch 2014-04-22 21:14:09 UTC (rev 23472) @@ -1,5 +1,5 @@ ---- screen-4.0.2-orig/config.h.in 2004-01-19 16:27:08.106776000 -0500 -+++ screen-4.0.2/config.h.in 2004-01-19 16:29:15.876778000 -0500 +--- screen-4.0.2-orig/acconfig.h 2004-01-19 16:27:08.106776000 -0500 ++++ screen-4.0.2/acconfig.h 2004-01-19 16:29:15.876778000 -0500 @@ -208,14 +208,16 @@ * If screen is installed with permissions to update /etc/utmp (such * as if it is installed set-uid root), define UTMPOK. 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 Apr 22 23:16:35 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:16:35 +0000 Subject: SF.net SVN: gar:[23473] csw/mgar/pkg/screen/trunk/files/CSWscrn.postinstall Message-ID: <3gCyJV1H18z1Sf@mail.opencsw.org> Revision: 23473 http://sourceforge.net/p/gar/code/23473 Author: chninkel Date: 2014-04-22 21:16:31 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove obsolete postinstall script Removed Paths: ------------- csw/mgar/pkg/screen/trunk/files/CSWscrn.postinstall Deleted: csw/mgar/pkg/screen/trunk/files/CSWscrn.postinstall =================================================================== --- csw/mgar/pkg/screen/trunk/files/CSWscrn.postinstall 2014-04-22 21:14:09 UTC (rev 23472) +++ csw/mgar/pkg/screen/trunk/files/CSWscrn.postinstall 2014-04-22 21:16:31 UTC (rev 23473) @@ -1,23 +0,0 @@ - -NEW_SOCKET_DIR="/var/opt/csw/run/screen/" - -# Screen socket directory has changed, we symlink all existing -# screen socket so the transition is transparent for users -for SOCKET_DIR in /tmp/uscreens /tmp/screens; do - [ -d "$SOCKET_DIR" ] || continue - cd $SOCKET_DIR - for DIR in S-*; do - [ -d "$DIR" ] || continue - mkdir -m 700 -p "$NEW_SOCKET_DIR/$DIR" - ls -lnd "$DIR" | awk ' { print $3, $4 }' | { - read _UID _GID - chown $_UID:$_GID "$NEW_SOCKET_DIR/$DIR" - } - for SESSION in "$DIR"/*; do - [ -p "$SESSION" ] || continue - ln -sf "$SOCKET_DIR/$SESSION" "$NEW_SOCKET_DIR/$SESSION" - done - done -done - -true 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 Apr 22 23:17:39 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:17:39 +0000 Subject: SF.net SVN: gar:[23474] csw/mgar/pkg/screen/trunk/files/ 0004-solaris10-has-linux-like-setenv.patch Message-ID: <3gCyLz5fqBz1XW@mail.opencsw.org> Revision: 23474 http://sourceforge.net/p/gar/code/23474 Author: chninkel Date: 2014-04-22 21:17:39 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: clean up setenv patch Modified Paths: -------------- csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch Modified: csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch 2014-04-22 21:16:31 UTC (rev 23473) +++ csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch 2014-04-22 21:17:39 UTC (rev 23474) @@ -4,12468 +4,9 @@ Subject: [PATCH] solaris10 has linux-like setenv --- - Makefile | 330 ++- - configure | 9543 ++++++++++++++++++++++++++----------------------------------- misc.c | 2 +- - 3 files changed, 4431 insertions(+), 5444 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/Makefile b/Makefile -index 06b972a..595dce6 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,3 +1,331 @@ --install all Makefiles and config: -+# -+# Makefile template for screen -+# -+# See machine dependant config.h for more configuration options. -+# -+ -+srcdir = . -+ -+ -+DESTDIR = -+ -+# Where to install screen. -+ -+prefix = /opt/csw -+exec_prefix = /opt/csw -+ -+# don't forget to change mandir and infodir in doc/Makefile. -+bindir = $(exec_prefix)/bin -+ -+VERSION = 4.0.3 -+SCREEN = screen-$(VERSION) -+ -+ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'` -+SCREENENCODINGS = `sed < config.h -n -e '/define SCREENENCODINGS/s/^.*"\([^"]*\)"/\1/p'` -+ -+CC = /opt/SUNWspro/bin/cc -+CFLAGS = -xO3 -m32 -xarch=pentium_pro -xchip=pentium_pro -+CPPFLAGS = -I/opt/csw/include -+LDFLAGS = -m32 -xarch=pentium_pro -xchip=pentium_pro -L/opt/csw/lib -+LIBS = -lcurses -lelf -lsocket -lnsl -lkstat -lcrypt -lpam -+ -+CPP=/opt/SUNWspro/bin/cc -E -+CPP_DEPEND=$(CC) -MM -+ -+INSTALL = /opt/csw/bin/ginstall -c -+INSTALL_PROGRAM = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+ -+AWK = gawk -+ -+### Chose some debug configuration options: -+# -DDEBUG -+# Turn on really heavy debug output. This is written to -+# /tmp/debug/{SCREEN,screen}.. Look at these files and quote -+# questionable sections when sending bug-reports to the author. -+# -DDUMPSHADOW -+# With shadow-pw screen would never dump core. Use this option if -+# you still want to have a core. Use only for debugging. -+OPTIONS= -+#OPTIONS= -DDEBUG -+ -+SHELL=/bin/sh -+ -+CFILES= screen.c ansi.c fileio.c mark.c misc.c resize.c socket.c \ -+ search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \ -+ termcap.c input.c attacher.c pty.c process.c display.c comm.c \ -+ kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \ -+ sched.c teln.c nethack.c encoding.c -+OFILES= screen.o ansi.o fileio.o mark.o misc.o resize.o socket.o \ -+ search.o tty.o term.o window.o utmp.o loadav.o putenv.o help.o \ -+ termcap.o input.o attacher.o pty.o process.o display.o comm.o \ -+ kmapdef.o acls.o braille.o braille_tsi.o logfile.o layer.o \ -+ sched.o teln.o nethack.o encoding.o -+ -+all: screen -+ -+screen: $(OFILES) -+ $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) -+ -+.c.o: -+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< -+ -+install_bin: .version screen -+ -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -+ then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi -+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -+ -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+# This doesn't work if $(bindir)/screen is a symlink -+ -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi -+ rm -f $(DESTDIR)$(bindir)/screen -+ (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen) -+ cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -+ -+############################################################################### -+install: installdirs install_bin -+ cd doc ; $(MAKE) install -+ -if [ -d /usr/lib/terminfo ]; then \ -+ PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ -+ chmod 644 /usr/lib/terminfo/s/screen*; \ -+ fi -+# Better do this by hand. E.g. under RCS... -+# cat ${srcdir}/terminfo/screencap >> /etc/termcap -+ @echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually." -+ @echo "You may also want to install $(srcdir)/etc/etcscreenrc in" $(ETCSCREENRC) -+ -+installdirs: -+# Path leading to ETCSCREENRC and Socketdirectory not checked. -+ $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) -+ cd doc ; $(MAKE) installdirs -+ -+uninstall: .version -+ rm -f $(DESTDIR)$(bindir)/$(SCREEN) -+ rm -f $(DESTDIR)$(bindir)/screen -+ -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen -+ rm -f $(DESTDIR)$(ETCSCREENRC) -+ cd doc; $(MAKE) uninstall -+ -+shadow: -+ mkdir shadow; -+ cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc ../terminfo ../etc . -+ rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h -+ echo "install all Makefiles and config:" > shadow/Makefile -+ echo " rm -f config.cache" >> shadow/Makefile -+ echo " sh ./configure" >> shadow/Makefile -+ -+term.h: term.c term.sh -+ AWK=$(AWK) srcdir=$(srcdir) sh $(srcdir)/term.sh -+ -+kmapdef.c: term.h -+ -+tty.c: tty.sh -+ sh $(srcdir)/tty.sh tty.c -+ -+comm.h: comm.c comm.sh config.h -+ AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh -+ -+osdef.h: osdef.sh config.h osdef.h.in -+ CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh -+ -+docs: -+ cd doc; $(MAKE) dvi screen.info -+ -+dvi info screen.info: -+ -cd doc; $(MAKE) $@ -+ -+mostlyclean: -+ rm -f $(OFILES) screen config.cache osdef0.c osdef1.sed osdef2.sed -+ -+clean celan: mostlyclean -+ rm -f tty.c term.h comm.h osdef.h kmapdef.c core -+ -+# Delete all files from the current directory that are created by -+# configuring or building the program. -+# building of term.h/comm.h requires awk. Keep it in the distribution -+# we keep config.h, as this file knows where 'make dist' finds the ETCSCREENRC. -+#distclean: mostlyclean -+# rm -f $(SCREEN).tar $(SCREEN).tar.gz -+# rm -f config.status Makefile -+# rm -f osdef.h doc/Makefile -+ -+maintainer-clean: -+ @echo "This command is not even intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# Delete everything from the current directory that can be -+# reconstructed with this Makefile. -+realclean: .version mostlyclean -+ rm -f $(SCREEN).tar $(SCREEN).tar.gz -+ rm -f config.status Makefile doc/Makefile -+ rm -f tty.c term.h comm.h osdef.h kmapdef.c -+ rm -f config.h -+ echo "install all Makefiles and config:" > Makefile -+ echo " sh ./configure" >> Makefile -+ -+tags TAGS: $(CFILES) -+ -ctags *.sh $(CFILES) *.h -+ -ctags -e *.sh $(CFILES) *.h -+ -+dist: .version $(SCREEN).tar.gz -+ -+$(SCREEN).tar: .version term.h comm.h tty.c kmapdef.c -+ -rm -rf dist -+ mkdir dist -+ mkdir dist/$(SCREEN) -+ ln acls.h ansi.h display.h extern.h logfile.h mark.h os.h \ -+ layer.h patchlevel.h screen.h window.h image.h \ -+ osdef.h.in term.sh tty.sh comm.sh osdef.sh braille.h \ -+ sched.h \ -+ $(CFILES) \ -+ ChangeLog COPYING INSTALL NEWS* TODO install.sh \ -+ dist/$(SCREEN) -+ cd dist/$(SCREEN); mv tty.c tty.c.dist -+ cd dist/$(SCREEN); mv kmapdef.c kmapdef.c.dist -+ ln configure.in configure dist/$(SCREEN) -+ sed -e 's@"/local/screens@"/tmp/screens@' -e 's@"/local@"/usr/local at g' < config.h.in > dist/$(SCREEN)/config.h.in -+ sed -e 's@[ ]/local@ /usr/local at g' -e 's/^CFLAGS = -g/CFLAGS = -O/' < Makefile.in > dist/$(SCREEN)/Makefile.in -+ ln term.h dist/$(SCREEN)/term.h.dist -+ ln comm.h dist/$(SCREEN)/comm.h.dist -+ ln README dist/$(SCREEN)/README -+ mkdir dist/$(SCREEN)/terminfo -+ cd terminfo; ln 8bits README checktc.c screencap \ -+ screeninfo.src test.txt tetris.c \ -+ ../dist/$(SCREEN)/terminfo -+ mkdir dist/$(SCREEN)/etc -+ cd etc; ln * ../dist/$(SCREEN)/etc -+ mkdir dist/$(SCREEN)/utf8encodings -+ cd utf8encodings; ln * ../dist/$(SCREEN)/utf8encodings -+ # sed -e 's/^startup/#startup/' -e 's/^autodetach/#autodetach/' < $(ETCSCREENRC) > dist/$(SCREEN)/etc/etcscreenrc -+ cp $(HOME)/.screenrc dist/$(SCREEN)/etc/screenrc -+ mkdir dist/$(SCREEN)/doc -+ sed -e 's@/local/emacs@/usr/local at g' < doc/Makefile.in > dist/$(SCREEN)/doc/Makefile.in -+ cd doc; ln FAQ README.DOTSCREEN screen.1 screen.texinfo fdpat.ps make.help window_to_display.ps \ -+ ../dist/$(SCREEN)/doc -+ cd doc; if test -f screen.info; then ln screen.info* \ -+ ../dist/$(SCREEN)/doc; fi -+ cd dist/$(SCREEN)/doc; ln -s ../install.sh . -+ cd dist/$(SCREEN); ln -s doc/FAQ . -+ echo "install all Makefiles and config:" > dist/$(SCREEN)/Makefile -+ echo " rm -f config.cache" >> dist/$(SCREEN)/Makefile -+ echo " sh ./configure" >> dist/$(SCREEN)/Makefile -+ cd dist; tar cf ../$(SCREEN).tar $(SCREEN) -+ rm -rf dist -+ -+$(SCREEN).tar.gz: $(SCREEN).tar -+ gzip -nf $(SCREEN).tar || gzip -f $(SCREEN).tar -+ -+# Perform self-tests (if any). -+check: -+ -+lint: -+ lint -I. $(CFILES) -+ -+saber: -+ #load $(CFLAGS) screen.c ansi.c $(LIBS) -+ -+config: - rm -f config.cache - sh ./configure -+ -+ -+############################################################################### -+ -+.version: -+ @rev=`sed < $(srcdir)/patchlevel.h -n -e '/#define REV/s/#define REV *//p'`; \ -+ vers=`sed < $(srcdir)/patchlevel.h -n -e '/#define VERS/s/#define VERS *//p'`; \ -+ pat=`sed < $(srcdir)/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define PATCHLEVEL *//p'`; \ -+ if [ "$${rev}.$${vers}.$${pat}" != "$(VERSION)" ]; then \ -+ echo "This distribution is screen-$${rev}.$${vers}.$${pat}, but"; \ -+ echo "the Makefile is from $(VERSION). Please update!"; exit 1; fi -+ -+############################################################################### -+ -+mdepend: $(CFILES) term.h -+ @rm -f DEPEND ; \ -+ for i in ${CFILES} ; do \ -+ echo "$$i" ; \ -+ echo `echo "$$i" | sed -e 's/.c$$/.o/'`": $$i" `\ -+ cc -E $$i |\ -+ grep '^# .*"\./.*\.h"' |\ -+ (sort -t'"' -u -k 2,2 2>/dev/null || sort -t'"' -u +1 -2) |\ -+ sed -e 's/.*"\.\/\(.*\)".*/\1/'\ -+ ` >> DEPEND ; \ -+ done -+ -+ -+depend: depend.in -+ ./config.status || ./configure -+ -+depend.in: $(CFILES) term.h -+ cp Makefile.in Makefile.in~ -+ sed -e '/\#\#\# Dependencies/q' < Makefile.in > tmp_make -+ for i in $(CFILES); do echo $$i; $(CPP_DEPEND) $$i >> tmp_make; done -+ mv tmp_make Makefile.in -+ -+############################################################################### -+ -+### Dependencies: -+screen.o: screen.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h braille.h \ -+ patchlevel.h logfile.h extern.h -+ansi.o: ansi.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h braille.h extern.h \ -+ logfile.h -+fileio.o: fileio.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+mark.o: mark.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h -+misc.o: misc.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+resize.o: resize.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+socket.o: socket.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+search.o: search.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h -+tty.o: tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+term.o: term.c term.h -+window.o: window.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+utmp.o: utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+loadav.o: loadav.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+putenv.o: putenv.c config.h -+help.o: help.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+termcap.o: termcap.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+input.o: input.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+attacher.o: attacher.c config.h screen.h os.h osdef.h ansi.h \ -+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h -+pty.o: pty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+process.o: process.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+display.o: display.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h -+comm.o: comm.c config.h acls.h comm.h -+kmapdef.o: kmapdef.c config.h -+acls.o: acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+braille.o: braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h -+braille_tsi.o: braille_tsi.c config.h screen.h os.h osdef.h ansi.h \ -+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h \ -+ braille.h -+logfile.o: logfile.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+layer.o: layer.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+sched.o: sched.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+teln.o: teln.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+nethack.o: nethack.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+encoding.o: encoding.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -diff --git a/configure b/configure -index 75675fc..d395c59 100755 ---- a/configure -+++ b/configure -@@ -1,82 +1,460 @@ - #! /bin/sh - # From configure.in Revision: 1.18 . - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.57. -+# Generated by GNU Autoconf 2.69. -+# -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi - --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -84,185 +462,118 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else -+ test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,51 +581,133 @@ PACKAGE_TARNAME= - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - ac_unique_file="screen.c" - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION ac_prefix_program CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA WRITEPATH XTERMPATH LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+XTERMPATH -+WRITEPATH -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+AWK -+EGREP -+GREP -+CPP -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+ac_prefix_program -+VERSION -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_socket_dir -+with_socket_dir -+with_pty_mode -+with_pty_group -+enable_pam -+enable_use_locale -+enable_telnet -+enable_colors256 -+enable_rxvt_osc -+with_sys_screenrc -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -337,34 +730,49 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -386,33 +794,59 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -439,6 +873,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -463,13 +903,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -534,6 +977,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -584,26 +1037,36 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -623,27 +1086,26 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -651,31 +1113,36 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -689,8 +1156,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -702,74 +1167,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi --fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -792,15 +1255,12 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -@@ -815,18 +1275,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -838,6 +1305,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-socket-dir disable system wide socket-dir and use ~/.screen instead -@@ -860,278 +1328,644 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CPP C preprocessor - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.69 - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. - --It was created by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- $ $0 $@ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## - --_ACEOF -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () - { --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval - --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+} # ac_fn_c_try_compile - --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --_ASUNAME -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+} # ac_fn_c_try_cpp - --} >&5 -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --cat >&5 <<_ACEOF -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval - -+} # ac_fn_c_try_link - --## ----------- ## --## Core tests. ## --## ----------- ## -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --_ACEOF -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval - -+} # ac_fn_c_try_run - --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. --# Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. --ac_configure_args= --ac_configure_args0= --ac_configure_args1= --ac_sep= --ac_must_keep_next=false --for ac_pass in 1 2 --do -- for ac_arg -- do -- case $ac_arg in -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case declares $2. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_func -+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 $as_me, which was -+generated by GNU Autoconf 2.69. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -+ ac_must_keep_next=false # Got value, back to normal. - else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core core.* *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1139,112 +1973,137 @@ cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1253,24 +2112,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ac_config_headers="$ac_config_headers config.h" -+ac_config_headers="$ac_config_headers config.h" - - - -@@ -1282,13 +2124,13 @@ echo "this is screen version $VERSION" 1>&6 - - - if test "x$prefix" = xNONE; then -- echo $ECHO_N "checking for prefix by $ECHO_C" >&6 -+ $as_echo_n "checking for prefix by " >&6 - # Extract the first word of "screen", so it can be a program name with args. - set dummy screen; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_ac_prefix_program+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_ac_prefix_program+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $ac_prefix_program in - [\\/]* | ?:[\\/]*) -@@ -1300,64 +2142,87 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - ;; - esac - fi - ac_prefix_program=$ac_cv_path_ac_prefix_program -- - if test -n "$ac_prefix_program"; then -- echo "$as_me:$LINENO: result: $ac_prefix_program" >&5 --echo "${ECHO_T}$ac_prefix_program" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prefix_program" >&5 -+$as_echo "$ac_prefix_program" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- if test -n $ac_prefix_program; then -- prefix=`(dirname "$ac_prefix_program") 2>/dev/null || -+ -+ if test -n "$ac_prefix_program"; then -+ prefix=`$as_dirname -- "$ac_prefix_program" || - $as_expr X"$ac_prefix_program" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_prefix_program" : 'X\(//\)[^/]' \| \ -- X"$ac_prefix_program" : 'X\(//\)$' \| \ -- X"$ac_prefix_program" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_prefix_program" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- prefix=`(dirname "$prefix") 2>/dev/null || -+ X"$ac_prefix_program" : 'X\(//\)[^/]' \| \ -+ X"$ac_prefix_program" : 'X\(//\)$' \| \ -+ X"$ac_prefix_program" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_prefix_program" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ prefix=`$as_dirname -- "$prefix" || - $as_expr X"$prefix" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$prefix" : 'X\(//\)[^/]' \| \ -- X"$prefix" : 'X\(//\)$' \| \ -- X"$prefix" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$prefix" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$prefix" : 'X\(//\)[^/]' \| \ -+ X"$prefix" : 'X\(//\)$' \| \ -+ X"$prefix" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$prefix" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ @@ 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 chninkel at users.sourceforge.net Tue Apr 22 23:36:39 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:36:39 +0000 Subject: SF.net SVN: gar:[23475] csw/mgar/pkg/screen/trunk/files Message-ID: <3gCylq325yz68@mail.opencsw.org> Revision: 23475 http://sourceforge.net/p/gar/code/23475 Author: chninkel Date: 2014-04-22 21:36:38 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: update patch opencsw-patchs.patch so that it can be applied on last upstream release Modified Paths: -------------- csw/mgar/pkg/screen/trunk/files/changelog.CSW csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:17:39 UTC (rev 23474) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:36:38 UTC (rev 23475) @@ -3,7 +3,7 @@ * New upstream version. * Removed screen_stub package. * Removed patch screen-maxwin.patch which has been applied upstream. - * Updated patch screen-utmp.patch. + * Updated patches screen-utmp.patch and opencsw-patchs.patch. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 Modified: csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch 2014-04-22 21:17:39 UTC (rev 23474) +++ csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch 2014-04-22 21:36:38 UTC (rev 23475) @@ -1,28 +1,27 @@ -From 9ad578b26aff7d81d413bae349294323f901d969 Mon Sep 17 00:00:00 2001 +From bd23f0a9e7bb5e09d73688ef2060d1f3a92d4855 Mon Sep 17 00:00:00 2001 From: Yann Rouillard -Date: Tue, 19 Jul 2011 23:30:44 +0200 +Date: Tue, 22 Apr 2014 23:30:36 +0200 Subject: [PATCH] Update of file paths in documentation files --- - doc/screen.1 | 16 +- - doc/screen.info-1 | 2 +- - doc/screen.info-5 | 10 +- - 5 files changed, 4432 insertions(+), 5458 deletions(-) + doc/screen.1 | 16 ++++++---------- + doc/screen.texinfo | 16 ++++++---------- + 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/doc/screen.1 b/doc/screen.1 -index 348d357..d7c9fdf 100644 +index 2ec73b5..2ef6b79 100644 --- a/doc/screen.1 +++ b/doc/screen.1 -@@ -581,7 +581,7 @@ Show a listing of all currently attached displays. +@@ -622,7 +622,7 @@ Show a listing of all currently attached displays. .SH CUSTOMIZATION The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to -/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If -+/tmp/screens or preferably to /var/run/screens chosen at compile-time. If ++/tmp/screens or preferably to /var/opt/csw/run/screens chosen at compile-time. If .I screen is installed setuid-root, then the administrator should compile -@@ -594,7 +594,7 @@ in the environment variable $SCREENDIR. +@@ -635,7 +635,7 @@ in the environment variable $SCREENDIR. When .I screen is invoked, it executes initialization commands from the files @@ -31,7 +30,7 @@ \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's defaults\*U that can be overridden in the following ways: for the global screenrc file -@@ -1669,7 +1669,7 @@ and then compile the entry with +@@ -1837,7 +1837,7 @@ and then compile the entry with The echo command may be used to annoy .I screen users with a 'message of the @@ -40,7 +39,7 @@ The option \*Q-n\*U may be used to suppress the line feed. See also \*Qsleep\*U. Echo is also useful for online checking of environment variables. -@@ -4416,21 +4416,17 @@ Examples in the +@@ -4846,21 +4846,17 @@ Examples in the .I screen distribution package for private and global initialization files. .IP $SYSSCREENRC @@ -54,7 +53,7 @@ +Read in after /etc/opt/csw/screenrc .IP $SCREENDIR/S- -.IP /local/screens/S- -+.IP /var/run/screens/S- ++.IP /var/opt/csw/run/screens/S- Socket directories (default) -.IP /usr/tmp/screens/S- -Alternate socket directories. @@ -65,62 +64,60 @@ .IP /tmp/screen-exchange .I screen `interprocess communication buffer' -diff --git a/doc/screen.info-1 b/doc/screen.info-1 -index ece1aba..e2ef7d2 100644 ---- a/doc/screen.info-1 -+++ b/doc/screen.info-1 -@@ -402,7 +402,7 @@ The `.screenrc' file +diff --git a/doc/screen.texinfo b/doc/screen.texinfo +index d721647..8eaa47a 100644 +--- a/doc/screen.texinfo ++++ b/doc/screen.texinfo +@@ -486,7 +486,7 @@ to be executed at startup, or on the fly using the @code{colon} command. + @cindex screenrc + When @code{screen} is invoked, it executes initialization commands from + the files @file{.screenrc} in the user's home directory and +- at file{/usr/local/etc/screenrc}. These defaults can be overridden in the ++ at file{/etc/opt/csw/screenrc}. These defaults can be overridden in the + following ways: + For the global screenrc file @code{screen} searches for the environment + variable @code{$SYSSCREENRC} (this override feature may be disabled at +@@ -5671,27 +5671,23 @@ Examples in the @code{screen} distribution package for private and + global initialization files. - When `screen' is invoked, it executes initialization commands from - the files `.screenrc' in the user's home directory and --`/usr/local/etc/screenrc'. These defaults can be overridden in the -+`/etc/opt/csw/screenrc'. These defaults can be overridden in the - following ways: For the global screenrc file `screen' searches for the - environment variable `$SYSSCREENRC' (this override feature may be - disabled at compile-time). The user specific screenrc file is searched -diff --git a/doc/screen.info-5 b/doc/screen.info-5 -index fff18bd..1601db3 100644 ---- a/doc/screen.info-5 -+++ b/doc/screen.info-5 -@@ -36,26 +36,22 @@ Files Referenced - global initialization files. + @item @code{$SYSSCREENRC} +- at itemx /local/etc/screenrc ++ at itemx /etc/opt/csw/screenrc + @code{screen} initialization commands - ``$SYSSCREENRC'' --`/local/etc/screenrc' -+`/etc/opt/csw/screenrc' - `screen' initialization commands + @item @code{$SCREENRC} + @itemx @code{$HOME}/.iscreenrc + @itemx @code{$HOME}/.screenrc +-Read in after /local/etc/screenrc ++Read in after /etc/opt/csw/screenrc - ``$SCREENRC'' - ``$HOME'/.iscreenrc' - ``$HOME'/.screenrc' -- Read in after /local/etc/screenrc -+ Read in after /etc/opt/csw/screenrc + @item @code{$SCREENDIR}/S- at var{login} - ``$SCREENDIR'/S-LOGIN' +- at item /local/screens/S- at var{login} ++ at item /var/opt/csw/run/screens/S- at var{login} + Socket directories (default) --`/local/screens/S-LOGIN' -+`/var/opt/csw/run/screen/S-LOGIN' - Socket directories (default) - --`/usr/tmp/screens/S-LOGIN' -- Alternate socket directories. +- at item /usr/tmp/screens/S- at var{login} +-Alternate socket directories. - - `SOCKET DIRECTORY/.termcap' - Written by the `dumptermcap' command + @item @var{socket directory}/.termcap + Written by the @code{dumptermcap} command --`/usr/tmp/screens/screen-exchange or' - `/tmp/screen-exchange' - `screen' interprocess communication buffer +- at item /usr/tmp/screens/screen-exchange or +- at itemx /tmp/screen-exchange ++ at item /tmp/screen-exchange + @code{screen} interprocess communication buffer -@@ -248,7 +248,7 @@ Socket Directory - ================ + @item hardcopy.[0-9] +@@ -5894,7 +5890,7 @@ does not include these features of 4.2 and 4.3 BSD UNIX. + @cindex socket directory - The socket directory defaults either to `$HOME/.screen' or simply to --`/tmp/screens' or preferably to `/usr/local/screens' chosen at -+`/tmp/screens' or preferably to `/var/opt/csw/run/screen' chosen at - compile-time. If `screen' is installed setuid root, then the - administrator should compile screen with an adequate (not NFS mounted) - `SOCKDIR'. If `screen' is not running setuid-root, the user can specify + The socket directory defaults either to @file{$HOME/.screen} or simply to +- at file{/tmp/screens} or preferably to @file{/usr/local/screens} chosen at ++ at file{/tmp/screens} or preferably to @file{/var/opt/csw/run/screens} chosen at + compile-time. If @code{screen} is installed + setuid root, then the administrator should compile screen with an + adequate (not NFS mounted) @code{SOCKDIR}. If @code{screen} is not -- -1.7.6 +1.8.4.1 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 Apr 22 23:37:32 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:37:32 +0000 Subject: SF.net SVN: gar:[23476] csw/mgar/pkg/screen/trunk Message-ID: <3gCymm05QGz9r@mail.opencsw.org> Revision: 23476 http://sourceforge.net/p/gar/code/23476 Author: chninkel Date: 2014-04-22 21:37:30 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove obsolete patch 0004-solaris10-has-linux-like-setenv.patch Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:36:38 UTC (rev 23475) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:37:30 UTC (rev 23476) @@ -56,10 +56,6 @@ # opencsw policy PATCHFILES += opencsw_paths.patch -# The wrong setenv prototype is used by default, this patch -# fixes the problem -PATCHFILES += 0004-solaris10-has-linux-like-setenv.patch - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet Deleted: csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch 2014-04-22 21:36:38 UTC (rev 23475) +++ csw/mgar/pkg/screen/trunk/files/0004-solaris10-has-linux-like-setenv.patch 2014-04-22 21:37:30 UTC (rev 23476) @@ -1,25 +0,0 @@ -From d8e0acd341275bfc830fe5135fd91325b166bf19 Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Mon, 13 Aug 2012 19:59:55 +0200 -Subject: [PATCH] solaris10 has linux-like setenv - ---- - misc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/misc.c b/misc.c -index 0ff7df8..2e79ae8 100644 ---- a/misc.c -+++ b/misc.c -@@ -613,7 +613,7 @@ char *value; - */ - # endif /* NEEDSETENV */ - #else /* USESETENV */ --# if defined(linux) || defined(__convex__) || (BSD >= 199103) -+# if defined(linux) || defined(__convex__) || (BSD >= 199103) || defined(__sun) || defined(__sun__) - setenv(var, value, 1); - # else - setenv(var, value); --- -1.7.10.3 - Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:36:38 UTC (rev 23475) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 21:37:30 UTC (rev 23476) @@ -2,7 +2,8 @@ * New upstream version. * Removed screen_stub package. - * Removed patch screen-maxwin.patch which has been applied upstream. + * Removed obsolete patches screen-maxwin.patch and + 0004-solaris10-has-linux-like-setenv.patch. * Updated patches screen-utmp.patch and opencsw-patchs.patch. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Apr 22 23:39:03 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:39:03 +0000 Subject: SF.net SVN: gar:[23477] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCypT6NBFzFW@mail.opencsw.org> Revision: 23477 http://sourceforge.net/p/gar/code/23477 Author: chninkel Date: 2014-04-22 21:39:03 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: comment update Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:37:30 UTC (rev 23476) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:39:03 UTC (rev 23477) @@ -65,7 +65,7 @@ include gar/category.mk -# we must recreate configure as we modified configure.in +# Only configure.in is provided so we must run autoconf pre-configure-modulated: cd $(WORKSRC) && $(prefix)/bin/autoconf 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 Apr 22 23:58:17 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:58:17 +0000 Subject: SF.net SVN: gar:[23478] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCzDg22kDzKx@mail.opencsw.org> Revision: 23478 http://sourceforge.net/p/gar/code/23478 Author: chninkel Date: 2014-04-22 21:58:15 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: we must use the provided autogen.sh and not directly autoconf Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:39:03 UTC (rev 23477) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:58:15 UTC (rev 23478) @@ -65,9 +65,9 @@ include gar/category.mk -# Only configure.in is provided so we must run autoconf +# Only configure.in is provided so we must run autogen.sh pre-configure-modulated: - cd $(WORKSRC) && $(prefix)/bin/autoconf + cd $(WORKSRC) && ./autogen.sh post-merge: for FILE in $(DOCFILES); do \ 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 Apr 22 23:58:52 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:58:52 +0000 Subject: SF.net SVN: gar:[23479] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCzFJ3RghzPH@mail.opencsw.org> Revision: 23479 http://sourceforge.net/p/gar/code/23479 Author: chninkel Date: 2014-04-22 21:58:51 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove some obsolete gar post-install code Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:58:15 UTC (rev 23478) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:58:51 UTC (rev 23479) @@ -73,7 +73,6 @@ for FILE in $(DOCFILES); do \ ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)/$(docdir)/$(NAME)/$$FILE; \ done - ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(NAME)/changelog.CSW ginstall -d $(PKGROOT)/var/$(prefix)/run/screen @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Apr 22 23:59:36 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 21:59:36 +0000 Subject: SF.net SVN: gar:[23480] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCzGC2BN0zSZ@mail.opencsw.org> Revision: 23480 http://sourceforge.net/p/gar/code/23480 Author: chninkel Date: 2014-04-22 21:59:36 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: fix compilation error 'undefined struct/union member: msg_controllen' Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:58:51 UTC (rev 23479) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:59:36 UTC (rev 23480) @@ -63,6 +63,16 @@ CONFIGURE_ARGS += --with-sys-screenrc=/etc$(prefix)/screenrc CONFIGURE_ARGS += --with-socket-dir=/var$(prefix)/run/screen +# We define this additional macros to avoid the following error: +# undefined struct/union member: msg_controllen +# undefined struct/union member: msg_control +# +# msg_control(len)? are defined in the historical BSD interfaces +# that are only available when the following macro are defined. +# +# see: http://stackoverflow.com/questions/1034587/how-does-xpg4-2-and-other-defines-work-on-solaris +EXTRA_CFLAGS += -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 + include gar/category.mk # Only configure.in is provided so we must run autogen.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 23 00:02:28 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 22:02:28 +0000 Subject: SF.net SVN: gar:[23481] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCzKS1q9XzWx@mail.opencsw.org> Revision: 23481 http://sourceforge.net/p/gar/code/23481 Author: chninkel Date: 2014-04-22 22:02:28 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove a useless checkpkg override Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 21:59:36 UTC (rev 23480) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:02:28 UTC (rev 23481) @@ -37,9 +37,6 @@ CHECKPKG_OVERRIDES_CSWscreen += surplus-dependency|CSWterminfo -# Default path referenced in documentation file, can be safely ignored -CHECKPKG_OVERRIDES_CSWscreen += file-with-bad-content|/usr/local|root/opt/csw/share/doc/screen/INSTALL - PKGFILES_CSWscreen = .* PRESERVECONF = /etc/opt/csw/screenrc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 23 00:03:39 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 22:03:39 +0000 Subject: SF.net SVN: gar:[23482] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCzLq3qvTzbF@mail.opencsw.org> Revision: 23482 http://sourceforge.net/p/gar/code/23482 Author: chninkel Date: 2014-04-22 22:03:39 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: remove a useless gar line Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:02:28 UTC (rev 23481) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:03:39 UTC (rev 23482) @@ -28,7 +28,6 @@ PACKAGES = CSWscreen - PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 SPKG_DESC_CSWscreen = A window manager that multiplexes a physical terminal. @@ -37,8 +36,6 @@ CHECKPKG_OVERRIDES_CSWscreen += surplus-dependency|CSWterminfo -PKGFILES_CSWscreen = .* - PRESERVECONF = /etc/opt/csw/screenrc MIGRATE_FILES = screenrc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 23 00:13:32 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 22:13:32 +0000 Subject: SF.net SVN: gar:[23483] csw/mgar/pkg/screen/trunk/Makefile Message-ID: <3gCzZF3ZYLzg6@mail.opencsw.org> Revision: 23483 http://sourceforge.net/p/gar/code/23483 Author: chninkel Date: 2014-04-22 22:13:26 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: re-add a not so useless gar post-install code Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:03:39 UTC (rev 23482) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:13:26 UTC (rev 23483) @@ -77,6 +77,7 @@ for FILE in $(DOCFILES); do \ ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)/$(docdir)/$(NAME)/$$FILE; \ done + ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(NAME)/changelog.CSW ginstall -d $(PKGROOT)/var/$(prefix)/run/screen @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 23 00:28:25 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 22:28:25 +0000 Subject: SF.net SVN: gar:[23484] csw/mgar/pkg/screen/trunk Message-ID: <3gCzvW6PkBzlL@mail.opencsw.org> Revision: 23484 http://sourceforge.net/p/gar/code/23484 Author: chninkel Date: 2014-04-22 22:28:24 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: added a debian patch to make sure existing screen sessions are not broken on upgrade Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/screen/trunk/files/60-644788-screen-4.1.0-4.0.3-interoperability.patch Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:13:26 UTC (rev 23483) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:28:24 UTC (rev 23484) @@ -50,6 +50,13 @@ # opencsw policy PATCHFILES += opencsw_paths.patch +# This patch makes sure existing screen sessions survive the upgrade +# from 4.0 to 4.2 despite the session protocol ugrade. +# This patch is taken from Debian. +# see: https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00024.html +# https://bugs.debian.org/644788 +PATCHFILES += 60-644788-screen-4.1.0-4.0.3-interoperability.patch + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet Added: csw/mgar/pkg/screen/trunk/files/60-644788-screen-4.1.0-4.0.3-interoperability.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/60-644788-screen-4.1.0-4.0.3-interoperability.patch (rev 0) +++ csw/mgar/pkg/screen/trunk/files/60-644788-screen-4.1.0-4.0.3-interoperability.patch 2014-04-22 22:28:24 UTC (rev 23484) @@ -0,0 +1,151 @@ +Author: Julien Cristau +Debian-Bug: #644788 + +Author: Axel Beckert +Debian-Bug: #684342 + +The following patch, while not all that pretty, seems to allow me to +attach to a screen started with either the squeeze or sid version. +I'm sure there's corner cases, but. + +Cheers, +Julien + +Index: screen/screen.h +=================================================================== +--- screen.orig/screen.h 2012-08-09 01:01:28.000000000 +0200 ++++ screen/screen.h 2012-08-09 01:01:28.000000000 +0200 +@@ -240,6 +240,57 @@ struct msg + } m; + }; + ++struct old_msg ++{ ++ int protocol_revision; /* reduce harm done by incompatible messages */ ++ int type; ++ char m_tty[MAXPATHLEN]; /* ttyname */ ++ union ++ { ++ struct ++ { ++ int lflag; ++ int aflag; ++ int flowflag; ++ int hheight; /* size of scrollback buffer */ ++ int nargs; ++ char line[MAXPATHLEN]; ++ char dir[MAXPATHLEN]; ++ char screenterm[20]; /* is screen really "screen" ? */ ++ } ++ create; ++ struct ++ { ++ char auser[20 + 1]; /* username */ ++ int apid; /* pid of frontend */ ++ int adaptflag; /* adapt window size? */ ++ int lines, columns; /* display size */ ++ char preselect[20]; ++ int esc; /* his new escape character unless -1 */ ++ int meta_esc; /* his new meta esc character unless -1 */ ++ char envterm[20 + 1]; /* terminal type */ ++ int encoding; /* encoding of display */ ++ } ++ attach; ++ struct ++ { ++ char duser[20 + 1]; /* username */ ++ int dpid; /* pid of frontend */ ++ } ++ detach; ++ struct ++ { ++ char auser[20 + 1]; /* username */ ++ int nargs; ++ char cmd[MAXPATHLEN]; /* command */ ++ int apid; /* pid of frontend */ ++ char preselect[20]; ++ } ++ command; ++ char message[MAXPATHLEN * 2]; ++ } m; ++}; ++ + /* + * And the signals the attacher receives from the backend + */ +Index: screen/socket.c +=================================================================== +--- screen.orig/socket.c 2012-08-09 01:01:28.000000000 +0200 ++++ screen/socket.c 2012-08-09 01:01:29.000000000 +0200 +@@ -1067,7 +1067,9 @@ ReceiveMsg() + } + if (left > 0) + { +- if (left != sizeof(m)) ++ if (left == sizeof(struct msg) - sizeof(struct old_msg)) ++ ;/* old format message, ignore */ ++ else if (left != sizeof(m)) + Msg(0, "Message %d of %d bytes too small", left, (int)sizeof(m)); + else + debug("No data on socket.\n"); +Index: screen/attacher.c +=================================================================== +--- screen.orig/attacher.c 2012-08-09 01:01:28.000000000 +0200 ++++ screen/attacher.c 2012-08-09 01:32:08.000000000 +0200 +@@ -133,6 +133,48 @@ struct msg *m; + return 0; + } + ++int ++WriteOldMessage(struct msg *m) ++{ ++ sleep(1); /* give the server some time to reopen the pipe */ ++ if (m->type == MSG_ATTACH && (m->m.attach.detachfirst == MSG_ATTACH || ++ m->m.attach.detachfirst == MSG_DETACH || ++ m->m.attach.detachfirst == MSG_POW_DETACH)) ++ { ++ struct old_msg old_m; ++ int s; ++ int r, l = sizeof(old_m); ++ ++ s = MakeClientSocket(0); ++ if (s < 0) ++ return 0; ++ old_m.protocol_revision = (('m'<<24) | ('s'<<16) | ('g'<<8) | 0); ++ old_m.type = m->type; ++ memcpy(old_m.m_tty, m->m_tty, sizeof(old_m.m_tty)); ++ memcpy(old_m.m.attach.auser, m->m.attach.auser, sizeof(old_m.m.attach.auser)); ++ old_m.m.attach.apid = m->m.attach.apid; ++ old_m.m.attach.adaptflag = m->m.attach.adaptflag; ++ old_m.m.attach.lines = m->m.attach.lines; ++ old_m.m.attach.columns = m->m.attach.columns; ++ memcpy(old_m.m.attach.preselect, m->m.attach.preselect, sizeof(old_m.m.attach.preselect)); ++ old_m.m.attach.esc = m->m.attach.esc; ++ old_m.m.attach.meta_esc = m->m.attach.meta_esc; ++ memcpy(old_m.m.attach.envterm, m->m.attach.envterm, sizeof(old_m.m.attach.envterm)); ++ old_m.m.attach.encoding = m->m.attach.encoding; ++ while(l > 0) ++ { ++ r = write(s, (char *)&old_m + (sizeof(struct old_msg) - l), l); ++ if (r == -1 && errno == EINTR) ++ continue; ++ if (r == -1 || r == 0) ++ return -1; ++ l -= r; ++ } ++ close(s); ++ } ++ return 0; ++} ++ + + int + Attach(how) +@@ -397,6 +439,7 @@ int how; + if (WriteMessage(lasts, &m)) + Panic(errno, "WriteMessage"); + close(lasts); ++ WriteOldMessage(&m); + debug1("Attach(%d): sent\n", m.type); + #ifdef MULTIUSER + if (multi && (how == MSG_ATTACH || how == MSG_CONT)) Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 22:13:26 UTC (rev 23483) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 22:28:24 UTC (rev 23484) @@ -5,6 +5,8 @@ * Removed obsolete patches screen-maxwin.patch and 0004-solaris10-has-linux-like-setenv.patch. * Updated patches screen-utmp.patch and opencsw-patchs.patch. + * Added patch 60-644788-screen-4.1.0-4.0.3-interoperability.patch to have a + smooth upgrade path that do not break existing screen sessions. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 23 01:10:30 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Apr 2014 23:10:30 +0000 Subject: SF.net SVN: gar:[23485] csw/mgar/pkg/screen/trunk Message-ID: <3gD0r246f2zrW@mail.opencsw.org> Revision: 23485 http://sourceforge.net/p/gar/code/23485 Author: chninkel Date: 2014-04-22 23:10:27 +0000 (Tue, 22 Apr 2014) Log Message: ----------- screen/trunk: force named pipe usage so existing sessions are not broken on upgrade Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/screen/trunk/files/0004-force-named-pipe-usage.patch Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 22:28:24 UTC (rev 23484) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-04-22 23:10:27 UTC (rev 23485) @@ -57,6 +57,11 @@ # https://bugs.debian.org/644788 PATCHFILES += 60-644788-screen-4.1.0-4.0.3-interoperability.patch +# Prior to screen 4.2.0, session sockets were in fact named pipe under Solaris +# we force this behavior to continue to be sure upgrading screen doesn't break +# existing sessions +PATCHFILES += 0004-force-named-pipe-usage.patch + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet @@ -74,6 +79,7 @@ # see: http://stackoverflow.com/questions/1034587/how-does-xpg4-2-and-other-defines-work-on-solaris EXTRA_CFLAGS += -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 + include gar/category.mk # Only configure.in is provided so we must run autogen.sh Added: csw/mgar/pkg/screen/trunk/files/0004-force-named-pipe-usage.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/0004-force-named-pipe-usage.patch (rev 0) +++ csw/mgar/pkg/screen/trunk/files/0004-force-named-pipe-usage.patch 2014-04-22 23:10:27 UTC (rev 23485) @@ -0,0 +1,25 @@ +From d59abe97bfdb53c2f0c7413c1e14985274950873 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Wed, 23 Apr 2014 01:03:54 +0200 +Subject: [PATCH] force named pipe usage + +--- + acconfig.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acconfig.h b/acconfig.h +index de55102..dd84cbd 100644 +--- a/acconfig.h ++++ b/acconfig.h +@@ -508,7 +508,7 @@ + /* + * Define this if your system supports named pipes. + */ +-#undef NAMEDPIPE ++#define NAMEDPIPE + + /* + * Define this if your system exits select() immediatly if a pipe is +-- +1.8.4.1 + Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 22:28:24 UTC (rev 23484) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-04-22 23:10:27 UTC (rev 23485) @@ -5,8 +5,9 @@ * Removed obsolete patches screen-maxwin.patch and 0004-solaris10-has-linux-like-setenv.patch. * Updated patches screen-utmp.patch and opencsw-patchs.patch. - * Added patch 60-644788-screen-4.1.0-4.0.3-interoperability.patch to have a - smooth upgrade path that do not break existing screen sessions. + * Added patch 60-644788-screen-4.1.0-4.0.3-interoperability.patch + and patch 0004-force-named-pipe-usage.patch to have a smooth + upgrade path that do not break existing screen sessions. -- Yann Rouillard Tue, 22 Apr 2014 22:58:01 +0200 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 Apr 23 10:11:15 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Apr 2014 08:11:15 +0000 Subject: SF.net SVN: gar:[23486] csw/mgar/gar/v2/lib/python/rest.py Message-ID: <3gDDr05FD0z1Hx@mail.opencsw.org> Revision: 23486 http://sourceforge.net/p/gar/code/23486 Author: wahwah Date: 2014-04-23 08:11:13 +0000 (Wed, 23 Apr 2014) Log Message: ----------- csw-upload-pkg: Handle HTTP 409 Add an error messages with an explanation of what's going on: you can't upload the same filename with a different content. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2014-04-22 23:10:27 UTC (rev 23485) +++ csw/mgar/gar/v2/lib/python/rest.py 2014-04-23 08:11:13 UTC (rev 23486) @@ -440,8 +440,8 @@ c.getinfo(pycurl.EFFECTIVE_URL)) c.close() logging.debug("HTTP code: %s", http_code) - if http_code == 401: - raise RestCommunicationError("Received HTTP code {0}".format(http_code)) + if http_code == 401 or (http_code >= 500 and http_code < 600): + raise RestCommunicationError("Received HTTP code {0}: {0}".format(http_code, d.getvalue())) successful = (http_code >= 200 and http_code <= 299) metadata = None if successful: @@ -459,11 +459,12 @@ c.setopt(pycurl.URL, url) c.setopt(pycurl.POST, 1) c = self._SetAuth(c) + basename = os.path.basename(filename) post_data = [ ('srv4_file', (pycurl.FORM_FILE, filename)), ('submit', 'Upload'), ('md5_sum', md5_sum), - ('basename', os.path.basename(filename)), + ('basename', basename), ] c.setopt(pycurl.HTTPPOST, post_data) c.setopt(pycurl.WRITEFUNCTION, d.write) @@ -480,8 +481,17 @@ logging.debug("*** Data") logging.debug(d.getvalue()) logging.debug("File POST http code: %s", http_code) - if http_code >= 400 and http_code <= 499: - raise RestCommunicationError("%s - HTTP code: %s" % (url, http_code)) + if http_code == 409: + msg = ('The server returned HTTP 409 conflict. This probably means ' + 'that there already is a file named {0} in the allpkgs ' + 'directory. You must not overwrite the same file name ' + 'with new content. If you really need to upload a new version ' + 'of your package, add a new REV stamp to it, so that the file ' + 'name becomes unique..'.format(basename)) + raise RestCommunicationError(msg) + if http_code >= 400 and http_code < 600: + msg = "{0} - HTTP code: {1}: {2}".format(url, http_code, d.getvalue()) + raise RestCommunicationError(msg) class CachedPkgstats(object): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Apr 23 10:11:25 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Apr 2014 08:11:25 +0000 Subject: SF.net SVN: gar:[23487] csw/mgar/gar/v2/lib/python Message-ID: <3gDDrK42GQz1MC@mail.opencsw.org> Revision: 23487 http://sourceforge.net/p/gar/code/23487 Author: wahwah Date: 2014-04-23 08:11:24 +0000 (Wed, 23 Apr 2014) Log Message: ----------- Maintainer activity: Filter out 'orphaned' It's a fake user name. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/activity.py csw/mgar/gar/v2/lib/python/maintainer_activity_report.py Modified: csw/mgar/gar/v2/lib/python/activity.py =================================================================== --- csw/mgar/gar/v2/lib/python/activity.py 2014-04-23 08:11:13 UTC (rev 23486) +++ csw/mgar/gar/v2/lib/python/activity.py 2014-04-23 08:11:24 UTC (rev 23487) @@ -18,6 +18,9 @@ STALE_PACKAGE_CUTOFF = 4 STALE_FROM_COLOR = '#FFDDBB' STALE_TO_COLOR = '#F995A0' +MAINTAINER_STOPLIST = [ + 'orphaned', +] def RevDeps(pkgs): revdeps = {} @@ -72,6 +75,8 @@ maintainers = {} for entry in pkgs: entry['maintainer'] = entry['maintainer'].split('@')[0] + if entry['maintainer'] in MAINTAINER_STOPLIST: + continue parsed_fn = opencsw.ParsePackageFileName(entry['basename']) dates_to_try = [] if 'REV' in parsed_fn['revision_info']: Modified: csw/mgar/gar/v2/lib/python/maintainer_activity_report.py =================================================================== --- csw/mgar/gar/v2/lib/python/maintainer_activity_report.py 2014-04-23 08:11:13 UTC (rev 23486) +++ csw/mgar/gar/v2/lib/python/maintainer_activity_report.py 2014-04-23 08:11:24 UTC (rev 23487) @@ -113,7 +113,8 @@ {{ username }} + href="http://www.opencsw.org/maintainers/{{ username }}/" + title="{{ maintainers[username].fullname }}">{{ username }} {% if maintainers[username].date_created %} @@ -191,7 +192,7 @@ for future in concurrent.futures.as_completed(key_by_future): key = key_by_future[future] if future.exception() is not None: - logging.warning('Fetching %r failed', url) + logging.warning('Fetching %r failed:', key, future.exception()) else: results_by_catrel[key] = future.result() return results_by_catrel @@ -242,6 +243,8 @@ for d in csw_db_maintainers: # maintainer, fullname, status, date_created username = d['maintainer'] + if username in activity.MAINTAINER_STOPLIST: + continue status = d['status'] date_created = None if d['date_created']: 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 Apr 23 10:11:41 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Apr 2014 08:11:41 +0000 Subject: SF.net SVN: gar:[23488] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: <3gDDrV0fdjz1Nt@mail.opencsw.org> Revision: 23488 http://sourceforge.net/p/gar/code/23488 Author: wahwah Date: 2014-04-23 08:11:40 +0000 (Wed, 23 Apr 2014) Log Message: ----------- releases-web: Don't allow duplicate uploads If a file with certain name is in the catalog, don't allow to overwrite it with new content. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-04-23 08:11:24 UTC (rev 23487) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-04-23 08:11:40 UTC (rev 23488) @@ -3,16 +3,17 @@ # A webpy application to allow HTTP access to the checkpkg database. -import sys -import os - import base64 -import cjson import datetime import hashlib import logging +import os +import sys +import tempfile + +import cjson +import lockfile import sqlobject -import tempfile import web from lib.python import checkpkg_lib @@ -24,7 +25,8 @@ from lib.python import relational_util from lib.web import web_lib -from lib.web import web_lib +# Read and write files in chunks of this size: +CHUNK_SIZE = 2 * (1024 ** 2) urls = ( r'/', 'Index', @@ -77,6 +79,24 @@ return "" +def FileMd5(fd): + file_hash = hashlib.md5() + # Don't read the whole file into memory at once, do it in small chunks. + data = fd.read(CHUNK_SIZE) + while data: + file_hash.update(data) + data = fd.read(CHUNK_SIZE) + return file_hash.hexdigest() + + +def CopyFile(infd, outfd): + infd.seek(0) + data = infd.read(CHUNK_SIZE) + while data: + os.write(outfd, data) + data = infd.read(CHUNK_SIZE) + + class Srv4List(object): def POST(self): @@ -90,44 +110,65 @@ web.header( 'Content-type', 'application/x-vnd.opencsw.pkg;type=upload-results') - file_hash = hashlib.md5() - # Don't read the whole file into memory at once, do it in small chunks. - chunk_size = 2 * 1024 * 1024 - data = x['srv4_file'].file.read(chunk_size) - while data: - file_hash.update(data) - data = x['srv4_file'].file.read(chunk_size) - data_md5_sum = file_hash.hexdigest() + data_md5_sum = FileMd5(x['srv4_file'].file) declared_md5_sum = x['md5_sum'] basename = x['basename'] save_attempt = False - if declared_md5_sum == data_md5_sum: + error = False + if declared_md5_sum != data_md5_sum: + raise web.conflict() + try: + srv4 = models.Srv4FileStats.selectBy(md5_sum=data_md5_sum).getOne() + except sqlobject.main.SQLObjectNotFound: + messages.append("File %s not found in the db." % data_md5_sum) + raise web.preconditionfailed() + + if not srv4.use_to_generate_catalogs: + messages.append( + '%r is not a package meant to be in catalogs ' + '(e.g. not CSW).' % basename) + raise web.preconditionfailed() + + target_path = os.path.join(ALLPKGS_DIR, basename) + lock_path = os.path.join('/tmp', '{0}.lock'.format(basename)) + target_file_lock = lockfile.FileLock(lock_path) + + # Have to get this lock to avoid two processes writing to the same file at + # the same time. + with target_file_lock: + on_disk_md5_sum = data_md5_sum + try: + with open(target_path, 'r') as fd: + on_disk_md5_sum = FileMd5(fd) + except IOError: + # The file doesn't exist yet. That's OK. + pass + if data_md5_sum != on_disk_md5_sum: + messages.append( + '%r already exists in the database with md5 sum %s. ' + 'The uploaded file is %s. We cannot overwrite the old filename ' + 'with new content.' % (basename, on_disk_md5_sum, data_md5_sum)) + raise web.conflict() + save_attempt = True - try: - srv4 = models.Srv4FileStats.selectBy(md5_sum=data_md5_sum).getOne() - if srv4.use_to_generate_catalogs: - # FieldStorage by default unlinks the temporary local file as soon as - # it's been opened. Therefore, we have to take care of writing data - # to the target location in an atomic way. - fd, tmp_filename = tempfile.mkstemp(dir=ALLPKGS_DIR) - x['srv4_file'].file.seek(0) - data = x['srv4_file'].file.read(chunk_size) - while data: - os.write(fd, data) - data = x['srv4_file'].file.read(chunk_size) - os.close(fd) - target_path = os.path.join(ALLPKGS_DIR, basename) - os.rename(tmp_filename, target_path) - # Since mkstemp creates files with mode 0600 by default: - os.chmod(target_path, 0644) - except sqlobject.main.SQLObjectNotFound: - messages.append("File %s not found in the db." % data_md5_sum) + # FieldStorage by default unlinks the temporary local file as soon as + # it's been opened. Therefore, we have to take care of writing data + # to the target location in an atomic way. + fd, tmp_filename = tempfile.mkstemp(dir=ALLPKGS_DIR) + CopyFile(x['srv4_file'].file, fd) + os.close(fd) + target_path = os.path.join(ALLPKGS_DIR, basename) + os.rename(tmp_filename, target_path) + # Since mkstemp creates files with mode 0600 by default: + os.chmod(target_path, 0644) messages.append({ "received_md5": data_md5_sum, "declared_md5": declared_md5_sum, "save_attempt": save_attempt, }) - return cjson.encode(messages) + response = cjson.encode(messages) + web.header('Content-Length', str(len(response))) + return response class Srv4Detail(object): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Apr 23 13:51:13 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 23 Apr 2014 11:51:13 +0000 Subject: SF.net SVN: gar:[23489] csw/mgar/pkg/perl/trunk Message-ID: <3gDKjh5N9yzCN@mail.opencsw.org> Revision: 23489 http://sourceforge.net/p/gar/code/23489 Author: claudio_sf Date: 2014-04-23 11:51:11 +0000 (Wed, 23 Apr 2014) Log Message: ----------- perl/trunk: configure,buils,tests,notInstallYet Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/checksums Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-23 08:11:40 UTC (rev 23488) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-23 11:51:11 UTC (rev 23489) @@ -140,7 +140,7 @@ CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) CONFIGURE_ARGS += -Dlddlflags=-shared -CONFIGURE_ARGS += -Dcccdlflags=-fPIC +#CONFIGURE_ARGS += -Dcccdlflags=-fPIC #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include @@ -214,7 +214,7 @@ # How to configure Perl - +PATH:=/opt/csw/gnu:$(PATH) configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS configure-perl: (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) @@ -223,12 +223,12 @@ build-perl: BUILD_EXPORTS = LD_OPTIONS build-perl: @echo " ==> Running make in $*" - cd $(WORKSRC) && $(BUILD_ENV) gmake perldtrace.h && $(BUILD_ENV) gmake $(MAKE_OPT) + cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) perldtrace.h && $(BUILD_ENV) $(MAKE) $(MAKE_OPT) @$(MAKECOOKIE) test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" - cd $(WORKSRC) && gmake test + cd $(WORKSRC) && $(MAKE) test @$(MAKECOOKIE) # Make links to libperl and minor-major lib dirs Modified: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2014-04-23 08:11:40 UTC (rev 23488) +++ csw/mgar/pkg/perl/trunk/checksums 2014-04-23 11:51:11 UTC (rev 23489) @@ -1 +1 @@ -d91b7bb3b0e0e7fe67b273e5bcb26916 perl-5.18.2-patched.tar.gz +ebe29eb6d3a4b264c2dbe3f186b309d2 perl-5.18.2-patched.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Apr 23 17:32:33 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 23 Apr 2014 15:32:33 +0000 Subject: SF.net SVN: gar:[23490] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gDQdG04RdzZp@mail.opencsw.org> Revision: 23490 http://sourceforge.net/p/gar/code/23490 Author: claudio_sf Date: 2014-04-23 15:32:30 +0000 (Wed, 23 Apr 2014) Log Message: ----------- perl/trunk: Clean up - Basic config Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-23 11:51:11 UTC (rev 23489) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-23 15:32:30 UTC (rev 23490) @@ -14,55 +14,17 @@ libraries. endef -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 MASTER_SITES = manual:// VENDOR_URL = http://www.perl.org #DISTFILES = $(NAME)-$(VERSION).tar.gz # The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -#BUILD64_ONLY = 1 PACKAGES += CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) -#RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -#RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -#INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -#PACKAGES += CSWperldoc -#SPKG_DESC_CSWperldoc = Perl documentation -#SPKG_DESC_CSWperl = Core Perl distribution -#RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -#ARCHALL_CSWperldoc = 1 - LICENSE = Copying -#CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -#OBSOLETED_BY_CSWperl += CSWpm-module-build -#OBSOLETED_BY_CSWperl += CSWpm-json-pp -#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta -#OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta -#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml -#OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata -#CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub -#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements -#OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype -#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - - - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd -#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio +# GCC build (Sunstudio is problematic) GARCOMPILER = GCC4 MAKE_OPT_unstable10s = -j 24 MAKE_OPT_unstable10x = -j 4 @@ -75,47 +37,18 @@ # Custom configure CONFIGURE_SCRIPTS = perl - -# Disabled, this is the first 5.16 release -# If I read the doc correctly, the arguments should be directories and not releases. I the the debian build does not have this option set. -# Compatable with all prior patch revs -# INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# We added some libs and options through CONFIGURE_ARGS values. The libs were picked up thorugh the hints mechanism. The db-4.8 must be investigated (needed/wished?) -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) -#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt - -# Configuration flags -# Commented options were not needed, or broke the build. Alternatives were supplied. CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) -#CONFIGURE_ARGS += -Dcc="$(CC) -B/usr/ccs/bin/" CONFIGURE_ARGS += -Dcc=$(CC) -#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -#CONFIGURE_ARGS += -Dld=$(CC) -#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -# Workaround below. Do not version libperl.so here otherwise the other 5.10 -# lib will be picked up by mgar -#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -#CONFIGURE_ARGS += -Dlocincpth=$(includedir) -#CONFIGURE_ARGS += -Dloclibpth=$(libdir) CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 CONFIGURE_ARGS += -Dman1ext=1 CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 CONFIGURE_ARGS += -Dman3ext=3perl -#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" CONFIGURE_ARGS += -Dperladmin="root at localhost" CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) -# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) +# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION) @@ -126,147 +59,42 @@ CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads CONFIGURE_ARGS += -Dusedtrace -#CONFIGURE_ARGS += -Dinc_version_list=none -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) CONFIGURE_ARGS += -Duselargefiles CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl5 CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl5 CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed CONFIGURE_ARGS-64 += -Duse64bitint CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) CONFIGURE_ARGS += -Dlddlflags=-shared -#CONFIGURE_ARGS += -Dcccdlflags=-fPIC -#EXTRA_LIB += $(prefix)/bdb48/lib -#EXTRA_INC += $(prefix)/bdb48/include -#EXTRA_INC += /usr/include -#LD_LIBRARY_PATH for testing -#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -#EXTRA_CFLAGS = $(CPPFLAGS) -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -#EXTRA_LDFLAGS = -lperl - # We want 64 bit binaries MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) -#EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -#PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -#EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -#EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release BUILD_SCRIPTS = perl - TEST_SCRIPTS = perl -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -#IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -#MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - include gar/category.mk -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -#post-extract-modulated: -# mkdir -p $(WORKSRC) -# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so -# @$(MAKECOOKIE) +# Configure -#ifneq ($(CORE_UPDATES),) -#POST_TARGETS = install-core-updates -#include files/updatecore.mk -#endif - -# How to configure Perl - PATH:=/opt/csw/gnu:$(PATH) configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS configure-perl: (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) @$(MAKECOOKIE) +# Build build-perl: BUILD_EXPORTS = LD_OPTIONS build-perl: @echo " ==> Running make in $*" cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) perldtrace.h && $(BUILD_ENV) $(MAKE) $(MAKE_OPT) @$(MAKECOOKIE) +# Test test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" cd $(WORKSRC) && $(MAKE) test @$(MAKECOOKIE) - -# Make links to libperl and minor-major lib dirs -#POST_TARGETS += syslinks -#syslinks: -# @echo "Creating links to libperl and minor-major lib dirs" -# cd $(DESTDIR)$(libdir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ -# cd $(VERSION_MAJOR) && ln -s libperl.so libperl.so.$(VERSION) && ln -s libperl.so libperl.so.$(VERSION_MAJOR) &&\ -# cd $(DESTDIR)$(datadir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) -# @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -post-install-modulated: $(POST_TARGETS) - @$(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 Apr 24 01:01:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Apr 2014 23:01:53 +0000 Subject: SF.net SVN: gar:[23491] csw/mgar/gar/v2 Message-ID: <3gDcbp14p2z5Z@mail.opencsw.org> Revision: 23491 http://sourceforge.net/p/gar/code/23491 Author: wahwah Date: 2014-04-23 23:01:52 +0000 (Wed, 23 Apr 2014) Log Message: ----------- submitpkg: Remove it This utility is unused for a long, long time now. Removed Paths: ------------- csw/mgar/gar/v2/bin/submitpkg csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Deleted: csw/mgar/gar/v2/bin/submitpkg =================================================================== --- csw/mgar/gar/v2/bin/submitpkg 2014-04-23 15:32:30 UTC (rev 23490) +++ csw/mgar/gar/v2/bin/submitpkg 2014-04-23 23:01:52 UTC (rev 23491) @@ -1 +0,0 @@ -link ../lib/python/submit_to_newpkgs.py \ No newline at end of file Deleted: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2014-04-23 15:32:30 UTC (rev 23490) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2014-04-23 23:01:52 UTC (rev 23491) @@ -1,249 +0,0 @@ -#!/opt/csw/bin/python2.6 -# coding=utf-8 -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# -# Copyright (c) 2009 Maciej Blizinski -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License version 2 as published by the -# Free Software Foundation. -# -# Formats e-mail to the OpenCSW maintainer. -# -# To avoid leaking the e-mail addresses, they're base64-encoded: -# -# python -c "print repr('somebody at example.com'.encode('base64'))" -# -# -# The plan: -# -# 1. If necessary, move the relevant packages from /home/testing to -# ~/to-release -# 2. Construct a list of all the files that are in ~/to-release -# 3. Clean newpkgs/ from the older versions of the files -# 4. Copy all the relevant files from ~/to-release to newpkgs/ -# 5. Format the e-mail -# 6. Tell how to send it (no automatic sending for now) - -import ConfigParser -import logging -import optparse -import os -import subprocess -import sys -import opencsw -import tag -import common_constants -import file_set_checker - - -CONFIG_INFO = """Create a file in ~/.releases.ini with the following content: - -; A configuration file for the release automation script - -[releases] -sender name = Your Name -sender email = your.email at opencsw.org -release manager name = Release Manager -release manager email = pkgsubmissions at lists.opencsw.org -; release cc = maintainers at example.com -; Usually it's /home/testing -package dir = /home/testing -target host = bender -target dir = /home/newpkgs -""" - -CONFIGURATION_FILE_LOCATIONS = [ - "/etc/opt/csw/releases.ini", - "%(HOME)s/.releases.ini", -] -CONFIG_REQUIRED_OPTS = [ - "sender name", "sender email", - "release manager email", - "package dir", -] -DEFAULT_FILE_NAME = "newpkgs.mail" -CONFIG_RELEASE_SECTION = "releases" - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageSubmissionError(Error): - pass - - -def RemoveOldFiles(basename_list, host, directory): - basename_str = " ".join(["%s/%s*" % (directory, x) for x in basename_list]) - args = ["ssh", host, "rm -f %s" % basename_str] - logging.debug("Running: %s" % args) - ret = subprocess.call(args) - if ret: - msg = ("Removing %s failed." % basename_str) - raise PackageSubmissionError(msg) - - -def RsyncFiles(files_to_rsync, dst_arg): - args = ["rsync", "-v"] + files_to_rsync + [dst_arg] - logging.debug(args) - try: - ret = subprocess.call(args) - except OSError, e: - raise PackageSubmissionError( - "Couldn't run %s, is the binary " - "in the $PATH? The error was: %s" % (repr(args[0]), e)) - if ret: - msg = ("Copying %s to %s has failed. " - "Are you on the login host?" % (p, dst_arg)) - logging.error(msg) - raise PackageSubmissionError(msg) - -def DisplayCswUploadPkgTeaser(files_to_rsync): - if not files_to_rsync: - print "No files have been processed." - return - print - print "Please try the new package upload tool." - print "It will upload your packages to the opencsw-future catalog." - print "http://mirror.opencsw.org/opencsw-future/" - print "Once uploaded, your packages will be available in a couple hours." - print "To upload, run the following command:" - print - script_path = os.path.join( - os.path.dirname(sys.argv[0]), - "csw-upload-pkg") - print "%s \\" % script_path - for f in files_to_rsync[:-1]: - print " %s \\" % f - print " %s" % files_to_rsync[-1] - - -def main(): - try: - config = ConfigParser.SafeConfigParser() - for file_name_tmpl in CONFIGURATION_FILE_LOCATIONS: - config.read(file_name_tmpl % os.environ) - for opt_name in CONFIG_REQUIRED_OPTS: - if not config.has_option(CONFIG_RELEASE_SECTION, opt_name): - logging.error("Option %s is missing from the configuration.", - repr(opt_name)) - raise ConfigurationError("Option %s is missing from the configuration." - % repr(opt_name)) - usage = """%s [options] [file1 file2 ...]""" % sys.argv[0] - parser = optparse.OptionParser(usage) - parser.add_option("--debug", - dest="debug", default=False, - action="store_true", - help="Print debugging messages") - parser.add_option("-d", "--package-dir", - dest="package_dir", - help="Specify the directory with packages") - parser.add_option("--no-clean", - dest="clean", default=True, - action="store_false", - help="Prevent submitpkg from deleting old files from newpkgs") - parser.add_option("-n", "--dry-run", - dest="dry_run", - default=False, action="store_true", - help="Do not perform write operations") - parser.add_option("-f", "--force", - dest="force", - default=False, action="store_true", - help="Proceed even if errors are reported") - (options, args) = parser.parse_args() - file_names = args - level = logging.INFO - if options.debug: - level = logging.DEBUG - logging.basicConfig(level=level) - if config.has_option(CONFIG_RELEASE_SECTION, "release manager name"): - release_mgr_name = config.get(CONFIG_RELEASE_SECTION, - "release manager name") - else: - release_mgr_name = None - if config.has_option(CONFIG_RELEASE_SECTION, "release cc"): - release_cc = config.get(CONFIG_RELEASE_SECTION, "release cc") - else: - release_cc = None - except ConfigurationError, e: - print "There was a problem with your configuration." - print CONFIG_INFO - print e - sys.exit(1) - - package_dir = config.get(CONFIG_RELEASE_SECTION, "package dir") - if options.package_dir: - package_dir = options.package_dir - staging_dir = opencsw.StagingDir(package_dir) - catalognames = [] - for file_name in file_names: - base_name = os.path.basename(file_name) - parsed_file_name = opencsw.ParsePackageFileName(base_name) - catalognames.append(parsed_file_name["catalogname"]) - catalognames = sorted(set(catalognames)) - if not file_names: - parser.print_help() - raise ConfigurationError("You need to specify package file names.") - - package_files = file_names - logging.debug("Copying files to the target host:dir") - remote_package_files = [] - remote_package_references = [] - files_to_rsync = [] - target_host = config.get(CONFIG_RELEASE_SECTION, "target host") - target_dir = config.get(CONFIG_RELEASE_SECTION, "target dir") - dst_arg = ("%s:%s" % (target_host, target_dir)) - for p in package_files: - files_to_rsync.append(p) - remote_package_files.append(dst_arg) - package_base_file_name = os.path.split(p)[1] - remote_package_references.append(dst_arg + "/" + package_base_file_name) - fc = file_set_checker.FileSetChecker() - error_tags = fc.CheckFiles(files_to_rsync) - if error_tags: - for error_tag in error_tags: - print error_tag - print "There seems to be a problem with the specified package set." - if not options.force: - sys.exit(1) - if options.clean: - RemoveOldFiles(catalognames, target_host, target_dir) - if options.dry_run: - print "files_to_rsync", files_to_rsync - print "dst_arg", dst_arg - else: - RsyncFiles(files_to_rsync, dst_arg) - nm = opencsw.NewpkgMailer( - catalognames, remote_package_references, - release_mgr_name=release_mgr_name, - release_mgr_email=config.get(CONFIG_RELEASE_SECTION, "release manager email"), - sender_name=config.get(CONFIG_RELEASE_SECTION, "sender name"), - sender_email=config.get(CONFIG_RELEASE_SECTION, "sender email"), - release_cc=release_cc) - mail_text = nm.FormatMail() - if options.dry_run: - print "Not writing the e-mail to disk." - print mail_text - else: - fd = open(DEFAULT_FILE_NAME, "w") - fd.write(mail_text) - fd.close() - text_editor = nm.GetEditorName(os.environ) - args = [text_editor, DEFAULT_FILE_NAME] - editor_ret = subprocess.call(args) - if editor_ret: - raise Error("File editing has failed.") - print - print "Your e-mail hasn't been sent yet!" - print "Issue the following command to have it sent:" - print "sendmail -t < %s" % DEFAULT_FILE_NAME - DisplayCswUploadPkgTeaser(files_to_rsync) - - -if __name__ == '__main__': - main() Deleted: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2014-04-23 15:32:30 UTC (rev 23490) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2014-04-23 23:01:52 UTC (rev 23491) @@ -1,16 +0,0 @@ -#!/usr/bin/env python2.6 - -# Try to use unittest2, fall back to unittest -try: - import unittest2 as unittest -except ImportError: - import unittest - -import submit_to_newpkgs as stn - -# FileSetChecker class and unit tests have been moved to a separate -# file. - - -if __name__ == '__main__': - unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Apr 24 11:15:33 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Apr 2014 09:15:33 +0000 Subject: SF.net SVN: gar:[23492] csw/mgar/pkg/cscope/trunk Message-ID: <3gDtCd2D3yzc7@mail.opencsw.org> Revision: 23492 http://sourceforge.net/p/gar/code/23492 Author: wahwah Date: 2014-04-24 09:15:31 +0000 (Thu, 24 Apr 2014) Log Message: ----------- cscope/trunk: It builds Modified Paths: -------------- csw/mgar/pkg/cscope/trunk/Makefile csw/mgar/pkg/cscope/trunk/checksums Modified: csw/mgar/pkg/cscope/trunk/Makefile =================================================================== --- csw/mgar/pkg/cscope/trunk/Makefile 2014-04-23 23:01:52 UTC (rev 23491) +++ csw/mgar/pkg/cscope/trunk/Makefile 2014-04-24 09:15:31 UTC (rev 23492) @@ -1,5 +1,5 @@ NAME = cscope -VERSION = 15.7a +VERSION = 15.8a GARTYPE = v2 DESCRIPTION = A text screen-based source browser @@ -13,18 +13,15 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = cscope -DISTFILES = $(DISTNAME).tar.bz2 +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +DISTFILES = $(DISTNAME).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) # Test suite won't run as root! TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWcscope += file-with-bad-content|/usr/local|root/opt/csw/bin/ocs + include gar/category.mk Modified: csw/mgar/pkg/cscope/trunk/checksums =================================================================== --- csw/mgar/pkg/cscope/trunk/checksums 2014-04-23 23:01:52 UTC (rev 23491) +++ csw/mgar/pkg/cscope/trunk/checksums 2014-04-24 09:15:31 UTC (rev 23492) @@ -1 +1 @@ -da43987622ace8c36bbf14c15a350ec1 cscope-15.7a.tar.bz2 +b5c898ccedcfe2d4aa69537dad73b610 cscope-15.8a.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Apr 24 19:36:32 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 24 Apr 2014 17:36:32 +0000 Subject: SF.net SVN: gar:[23493] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gF5Kj4MGkzFJ@mail.opencsw.org> Revision: 23493 http://sourceforge.net/p/gar/code/23493 Author: claudio_sf Date: 2014-04-24 17:36:31 +0000 (Thu, 24 Apr 2014) Log Message: ----------- perl/trunk: Fix pkging errors Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-24 09:15:31 UTC (rev 23492) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-24 17:36:31 UTC (rev 23493) @@ -20,8 +20,8 @@ # The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -PACKAGES += CSWperl -PKG_DESC_CSWperl = $(DESCRIPTION) +PACKAGE = CSWperl +PKG_DESC = $(DESCRIPTION) LICENSE = Copying # GCC build (Sunstudio is problematic) @@ -31,10 +31,27 @@ MAKE_OPT = $(MAKE_OPT_$(shell hostname)) BUILD64 = 1 ISAEXEC = 1 +IGNORE_DESTDIR = 1 # a .git directory will cause failing upstream author tests (the source will be considered blead) NOGITPATCH = 1 +# Depends +RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 +INCOMPATIBLE_PKGS = CSWperlmods CSWpmdigest CSWpmi18nlangtags CSWperldoc +CHECKPKG_OVERRIDES += file-with-bad-content +OBSOLETED_BY_CSWperl += CSWperldoc +OBSOLETED_BY_CSWperl += CSWpm-module-build +OBSOLETED_BY_CSWperl += CSWpm-json-pp +OBSOLETED_BY_CSWperl += CSWpm-cpan-meta +OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta +OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml +OBSOLETED_BY_CSWperl += CSWpm-module-metadata +CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub +OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements +OBSOLETED_BY_CSWperl += CSWpm-perl-ostype + # Custom configure CONFIGURE_SCRIPTS = perl CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) @@ -94,6 +111,9 @@ @$(MAKECOOKIE) # Test +# Beware, test may fail when run in paralled. We leave it like this because it's a lot faster and the failure not very common. Just rerun mgar test. +# You can always run the test single threaded if needed. + test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" cd $(WORKSRC) && $(MAKE) test This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Apr 24 20:19:06 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 24 Apr 2014 18:19:06 +0000 Subject: SF.net SVN: gar:[23494] csw/mgar/pkg/tor/branches/alpha Message-ID: <3gF6Gr4cdWzKd@mail.opencsw.org> Revision: 23494 http://sourceforge.net/p/gar/code/23494 Author: jake_goerzen Date: 2014-04-24 18:19:04 +0000 (Thu, 24 Apr 2014) Log Message: ----------- tor/branches/alpha: add patches to fix compiling on Solaris Modified Paths: -------------- csw/mgar/pkg/tor/branches/alpha/Makefile Added Paths: ----------- csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch csw/mgar/pkg/tor/branches/alpha/files/fixes_bug11426.patch Modified: csw/mgar/pkg/tor/branches/alpha/Makefile =================================================================== --- csw/mgar/pkg/tor/branches/alpha/Makefile 2014-04-24 17:36:31 UTC (rev 23493) +++ csw/mgar/pkg/tor/branches/alpha/Makefile 2014-04-24 18:19:04 UTC (rev 23494) @@ -8,9 +8,16 @@ Basically tor provides a distributed network of servers (onion routers). Users bounce their TCP streams (web traffic, ftp, ssh, etc) around the routers, and recipients, observers, and even the routers themselves have difficulty tracking the source of the stream. endef +# This is where the source git repo is located but we are building from the +# official alpha release tar.gz distibution downloaded from MATER_SITES. +# GIT_REPOS = git://git.torproject.org/tor.git + MASTER_SITES = http://www.torproject.org/dist/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += fixes_bug11426.patch +PATCHFILES += 0001-add-test-to-detech-we-are-on-Solaris.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch =================================================================== --- csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch 2014-04-24 18:19:04 UTC (rev 23494) @@ -0,0 +1,28 @@ +From 12209beaed0135b2bf11669cfc7ea27c2b36094f Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Thu, 24 Apr 2014 18:57:38 +0200 +Subject: [PATCH] add test to detech we are on Solaris + +--- + src/test/test_bt_cl.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c +index 45ae82f..7352e9e 100644 +--- a/src/test/test_bt_cl.c ++++ b/src/test/test_bt_cl.c +@@ -20,6 +20,11 @@ static int crashtype = 0; + #define NORETURN __attribute__((noreturn)) + #endif + ++#if defined(__sun) && defined(__SVR4) ++#define NOINLINE __attribute__((noinline)) ++#define NORETURN __attribute__((noreturn)) ++#endif ++ + int crash(int x) NOINLINE; + int oh_what(int x) NOINLINE; + int a_tangled_web(int x) NOINLINE; +-- +1.8.4.1 + Added: csw/mgar/pkg/tor/branches/alpha/files/fixes_bug11426.patch =================================================================== --- csw/mgar/pkg/tor/branches/alpha/files/fixes_bug11426.patch (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/files/fixes_bug11426.patch 2014-04-24 18:19:04 UTC (rev 23494) @@ -0,0 +1,41 @@ +From 9ccedbece0052cf743d5e5703e1676cda6cab733 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson +Date: Mon, 7 Apr 2014 13:07:14 -0400 +Subject: [PATCH 1/1] Make csiphash use the proper endian-converter on solaris + +fixes bug 11426; bugfix on 0.2.5.3-alpha, where csiphash was +introduced. +--- + changes/bug11426 | 3 +++ + src/ext/csiphash.c | 4 ++++ + 2 files changed, 7 insertions(+) + create mode 100644 changes/bug11426 + +diff --git a/changes/bug11426 b/changes/bug11426 +new file mode 100644 +index 0000000..23b1e7d +--- /dev/null ++++ b/changes/bug11426 +@@ -0,0 +1,3 @@ ++ o Minor bugfixes: ++ - Fix compilation on Solaris, which does not have . ++ Fixes bug 11426; bugfix on 0.2.5.3-alpha. +diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c +index 2a96f28..c247886 100644 +--- a/src/ext/csiphash.c ++++ b/src/ext/csiphash.c +@@ -46,6 +46,10 @@ + #elif defined(__APPLE__) + # include + # define _le64toh(x) OSSwapLittleToHostInt64(x) ++#elif defined(sun) || defined(__sun) ++# include ++# define _le64toh(x) LE_64(x) ++ + #else + + /* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ +-- +1.7.10.4 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Apr 24 20:29:38 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 24 Apr 2014 18:29:38 +0000 Subject: SF.net SVN: gar:[23495] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gF6W11TlKzPC@mail.opencsw.org> Revision: 23495 http://sourceforge.net/p/gar/code/23495 Author: claudio_sf Date: 2014-04-24 18:29:37 +0000 (Thu, 24 Apr 2014) Log Message: ----------- perl/trunk: Add override file-with-bad-content Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-24 18:19:04 UTC (rev 23494) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-24 18:29:37 UTC (rev 23495) @@ -40,7 +40,6 @@ RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 INCOMPATIBLE_PKGS = CSWperlmods CSWpmdigest CSWpmi18nlangtags CSWperldoc -CHECKPKG_OVERRIDES += file-with-bad-content OBSOLETED_BY_CSWperl += CSWperldoc OBSOLETED_BY_CSWperl += CSWpm-module-build OBSOLETED_BY_CSWperl += CSWpm-json-pp @@ -51,6 +50,7 @@ CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements OBSOLETED_BY_CSWperl += CSWpm-perl-ostype +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content # Custom configure CONFIGURE_SCRIPTS = perl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Apr 24 20:54:15 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 24 Apr 2014 18:54:15 +0000 Subject: SF.net SVN: gar:[23496] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gF73N3ptKzTN@mail.opencsw.org> Revision: 23496 http://sourceforge.net/p/gar/code/23496 Author: claudio_sf Date: 2014-04-24 18:54:15 +0000 (Thu, 24 Apr 2014) Log Message: ----------- perl/trunk: Override no-direct-binding false positive Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-24 18:29:37 UTC (rev 23495) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-24 18:54:15 UTC (rev 23496) @@ -51,6 +51,9 @@ OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements OBSOLETED_BY_CSWperl += CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +# Overridden because "/usr/ccs/bin/elfdump -y " returns output +CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libssp.so.0 # Custom configure CONFIGURE_SCRIPTS = perl 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 Apr 25 01:59:58 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Apr 2014 23:59:58 +0000 Subject: SF.net SVN: gar:[23497] csw/mgar/pkg/gcc4/trunk Message-ID: <3gFFrL4QSCzpL@mail.opencsw.org> Revision: 23497 http://sourceforge.net/p/gar/code/23497 Author: wahwah Date: 2014-04-24 23:59:56 +0000 (Thu, 24 Apr 2014) Log Message: ----------- gcc4/trunk: Version upgrade Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gcc4/trunk/files/changelog.CSW Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-24 18:54:15 UTC (rev 23496) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-24 23:59:56 UTC (rev 23497) @@ -1,12 +1,11 @@ # $Id$ NAME = gcc -VERSION = 4.8.2 +VERSION = 4.9.0 GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') PKG_VERSION_TOKEN = gcc4 PKG_BASENAME = CSW$(PKG_VERSION_TOKEN) -# PKG_BASENAME = CSWgcc-$(subst .,-,$(BASE_VERION)) DESCRIPTION = The GNU Compiler Collection define BLURB @@ -18,6 +17,7 @@ DISTFILES = $(DISTNAME).tar.bz2 # MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ # MASTER_SITES += http://ftp.heanet.ie/mirrors/gnu/gcc/$(NAME)-$(VERSION)/ +MASTER_SITES += ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.9.0/ MASTER_SITES += ftp://ftp.gnu.org/gnu/gcc/gcc-$(VERSION)/ LIBOBJC = 4 @@ -27,6 +27,9 @@ # PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +ISA_DEFAULT_sparc-5.9 = sparcv8plus +ISA_DEFAULT_i386-5.9 = pentium_pro + # there is a problem with direct linking on amd64 libs LINKER_DIRECT = @@ -75,13 +78,19 @@ CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX) -# Using ccs/bin/bas on x86 results in this problem: +# Using ccs/bin/as on x86 results in this problem: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35531 -CONFIGURE_ARGS_sparc += --with-as=/usr/ccs/bin/as -CONFIGURE_ARGS_sparc += --without-gnu-as -CONFIGURE_ARGS_i386 += --with-gnu-as -CONFIGURE_ARGS_i386 += --with-as=/opt/csw/bin/gas -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) +# Using GNU as on sparc on 5.10 causes another problem which I don't exactly +# remember, but we seem to need to use different as's on different platforms. +CONFIGURE_ARGS_sparc_5.9 += --with-as=/opt/csw/bin/gas +CONFIGURE_ARGS_sparc_5.9 += --with-gnu-as +CONFIGURE_ARGS_sparc_5.10 += --with-as=/usr/ccs/bin/as +CONFIGURE_ARGS_sparc_5.10 += --without-gnu-as +CONFIGURE_ARGS_i386_5.9 += --with-gnu-as +CONFIGURE_ARGS_i386_5.9 += --with-as=/opt/csw/bin/gas +CONFIGURE_ARGS_i386_5.10 += --with-gnu-as +CONFIGURE_ARGS_i386_5.10 += --with-as=/opt/csw/bin/gas +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)_$(GAROSREL)) # GCC can't be built in the same directory with the sources. # It also can't be built in a subdirectory of the sources. @@ -100,7 +109,7 @@ SKIPTEST ?= 1 # Used multiple times in package definitions -JAVA_LIB_VERSION = 14 +JAVA_LIB_VERSION = 15 ALTERNATIVES_PRIO = 482 @@ -113,10 +122,10 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 @@ -233,12 +242,12 @@ SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0 RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 -PACKAGES += CSWlibgo4 -PKGFILES_CSWlibgo4 += $(call baseisadirs,$(libdir),libgo\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibgo4 += $(DESCRIPTION), libgo.so.4 -RUNTIME_DEP_PKGS_CSWlibgo4 += CSWlibgcc-s1 +PACKAGES += CSWlibgo5 +PKGFILES_CSWlibgo5 += $(call baseisadirs,$(libdir),libgo\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibgo5 += $(DESCRIPTION), libgo.so.4 +RUNTIME_DEP_PKGS_CSWlibgo5 += CSWlibgcc-s1 # Hasn't been investigated. I feel lucky. -CHECKPKG_OVERRIDES_CSWlibgo4 += file-with-bad-content +CHECKPKG_OVERRIDES_CSWlibgo5 += file-with-bad-content PACKAGES += CSWlibitm1 PKGFILES_CSWlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) @@ -284,7 +293,7 @@ PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.* RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1 @@ -311,7 +320,7 @@ PKGFILES_$(PKG_BASENAME)gfortran += $(call baseisadirs,$(libdir),libgfortran\.so) RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgfortran3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibiconv2 @@ -327,7 +336,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmp10 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWecj -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2 @@ -403,7 +412,7 @@ PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc.so) PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc_gc.so) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) @@ -427,7 +436,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 @@ -474,7 +483,7 @@ CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgo4 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgo5 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding @@ -498,7 +507,13 @@ # Use CSW or Solaris tools explicitly: AR = /usr/ccs/bin/ar -AS = /usr/ccs/bin/as + +# AS_sparc_5.9 = /opt/csw/bin/gas +AS_sparc_5.10 = /usr/ccs/bin/as +# AS_i386_5.9 = /opt/csw/bin/gas +AS_i386_5.10 = /opt/csw/bin/gas +AS = $(AS_$(GARCH)_$(GAROSREL)) + NM = /usr/ccs/bin/nm RANLIB = /usr/ccs/bin/ranlib STRIP = /usr/css/bin/strip Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2014-04-24 18:54:15 UTC (rev 23496) +++ csw/mgar/pkg/gcc4/trunk/checksums 2014-04-24 23:59:56 UTC (rev 23497) @@ -1 +1 @@ -a3d7d63b9cb6b6ea049469a0c4a43c9d gcc-4.8.2.tar.bz2 +9709b49ae0e904cbb0a6a1b62853b556 gcc-4.9.0.tar.bz2 Added: csw/mgar/pkg/gcc4/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/changelog.CSW 2014-04-24 23:59:56 UTC (rev 23497) @@ -0,0 +1,6 @@ +gcc (4.9.0,REV=2014.04.25) + + * Upgrade to 4.9.0 + + -- Maciej Blizinski Fri, 25 Apr 2014 01:59:19 +0200 + 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 Apr 25 12:18:38 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Apr 2014 10:18:38 +0000 Subject: SF.net SVN: gar:[23498] csw/mgar/pkg/geeqie/trunk Message-ID: <3gFWZ15Klkz1CT@mail.opencsw.org> Revision: 23498 http://sourceforge.net/p/gar/code/23498 Author: wahwah Date: 2014-04-25 10:18:17 +0000 (Fri, 25 Apr 2014) Log Message: ----------- geeqie/trunk: Rebuild, update dependencies, add changelog Modified Paths: -------------- csw/mgar/pkg/geeqie/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/geeqie/trunk/files/changelog.CSW Modified: csw/mgar/pkg/geeqie/trunk/Makefile =================================================================== --- csw/mgar/pkg/geeqie/trunk/Makefile 2014-04-24 23:59:56 UTC (rev 23497) +++ csw/mgar/pkg/geeqie/trunk/Makefile 2014-04-25 10:18:17 UTC (rev 23498) @@ -7,23 +7,30 @@ CATEGORIES = gnome GARTYPE = v2 DESCRIPTION = A lightweight image viewer, forked from GQview -define BLURB -endef -SPKG_SOURCEURL = http://geeqie.sourceforge.net/ +VENDOR_URL = http://geeqie.sourceforge.net/ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) EXTRA_LDFLAGS = -lsocket -RUNTIME_DEP_PKGS_CSWgeeqie += CSWgtk2 -RUNTIME_DEP_PKGS_CSWgeeqie += CSWlcmsrt -RUNTIME_DEP_PKGS_CSWgeeqie += CSWglib2 -RUNTIME_DEP_PKGS_CSWgeeqie += CSWpango -RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibatk -RUNTIME_DEP_PKGS_CSWgeeqie += CSWggettextrt -RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibcairo -RUNTIME_DEP_PKGS_CSWgeeqie += CSWfconfig -RUNTIME_DEP_PKGS_CSWgeeqie += CSWftype2 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWliblcms1 +CHECKPKG_OVERRIDES_CSWgeeqie += file-with-bad-content|/usr/share|root/opt/csw/bin/geeqie + +CHECKPKG_OVERRIDES_CSWgeeqie += bad-rpath-entry|/lib|opt/csw/bin/geeqie +CHECKPKG_OVERRIDES_CSWgeeqie += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/geeqie +CHECKPKG_OVERRIDES_CSWgeeqie += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/geeqie +CHECKPKG_OVERRIDES_CSWgeeqie += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/bin/geeqie + include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/geeqie/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/geeqie/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/geeqie/trunk/files/changelog.CSW 2014-04-25 10:18:17 UTC (rev 23498) @@ -0,0 +1,6 @@ +geeqie (1.0,REV=2014.04.25) + + * Rebuild with updated dependencies; RPATH remains unsolved. + + -- Maciej Blizinski Fri, 25 Apr 2014 12:17:50 +0200 + 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 Apr 25 12:50:30 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Apr 2014 10:50:30 +0000 Subject: SF.net SVN: gar:[23499] csw/mgar/pkg/geeqie/trunk/Makefile Message-ID: <3gFXGj63fwz1J0@mail.opencsw.org> Revision: 23499 http://sourceforge.net/p/gar/code/23499 Author: wahwah Date: 2014-04-25 10:50:27 +0000 (Fri, 25 Apr 2014) Log Message: ----------- geeqie/trunk: Freetype seems to be not used on intel Modified Paths: -------------- csw/mgar/pkg/geeqie/trunk/Makefile Modified: csw/mgar/pkg/geeqie/trunk/Makefile =================================================================== --- csw/mgar/pkg/geeqie/trunk/Makefile 2014-04-25 10:18:17 UTC (rev 23498) +++ csw/mgar/pkg/geeqie/trunk/Makefile 2014-04-25 10:50:27 UTC (rev 23499) @@ -18,12 +18,15 @@ RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgeeqie += CSWliblcms1 +# For some mysterious reason, this library is only used on intel. +RUNTIME_DEP_PKGS_CSWgeeqie_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgeeqie_sparc += $(RUNTIME_DEP_PKGS_CSWgeeqie_$(GARCH)) + CHECKPKG_OVERRIDES_CSWgeeqie += file-with-bad-content|/usr/share|root/opt/csw/bin/geeqie CHECKPKG_OVERRIDES_CSWgeeqie += bad-rpath-entry|/lib|opt/csw/bin/geeqie 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 Apr 25 14:21:42 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Apr 2014 12:21:42 +0000 Subject: SF.net SVN: gar:[23500] csw/mgar/pkg/geeqie/trunk/Makefile Message-ID: <3gFZHy36Zmz3d@mail.opencsw.org> Revision: 23500 http://sourceforge.net/p/gar/code/23500 Author: wahwah Date: 2014-04-25 12:21:39 +0000 (Fri, 25 Apr 2014) Log Message: ----------- geeqie/trunk: I can't gmake today. Corrected a typo. Modified Paths: -------------- csw/mgar/pkg/geeqie/trunk/Makefile Modified: csw/mgar/pkg/geeqie/trunk/Makefile =================================================================== --- csw/mgar/pkg/geeqie/trunk/Makefile 2014-04-25 10:50:27 UTC (rev 23499) +++ csw/mgar/pkg/geeqie/trunk/Makefile 2014-04-25 12:21:39 UTC (rev 23500) @@ -25,7 +25,7 @@ # For some mysterious reason, this library is only used on intel. RUNTIME_DEP_PKGS_CSWgeeqie_sparc += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWgeeqie_sparc += $(RUNTIME_DEP_PKGS_CSWgeeqie_$(GARCH)) +RUNTIME_DEP_PKGS_CSWgeeqie += $(RUNTIME_DEP_PKGS_CSWgeeqie_$(GARCH)) CHECKPKG_OVERRIDES_CSWgeeqie += file-with-bad-content|/usr/share|root/opt/csw/bin/geeqie This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Apr 25 14:50:03 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 25 Apr 2014 12:50:03 +0000 Subject: SF.net SVN: gar:[23501] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gFZwg5GfKzCJ@mail.opencsw.org> Revision: 23501 http://sourceforge.net/p/gar/code/23501 Author: claudio_sf Date: 2014-04-25 12:50:02 +0000 (Fri, 25 Apr 2014) Log Message: ----------- perl/trunk: skip long tests for now (they pass) Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-25 12:21:39 UTC (rev 23500) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-25 12:50:02 UTC (rev 23501) @@ -1,3 +1,5 @@ +KIPTEST=1 + NAME = perl VERSION = 5.18.2 VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) @@ -52,8 +54,8 @@ OBSOLETED_BY_CSWperl += CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content # Overridden because "/usr/ccs/bin/elfdump -y " returns output -CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libssp.so.0 +#CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +#CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libssp.so.0 # Custom configure CONFIGURE_SCRIPTS = 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 Fri Apr 25 22:53:43 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Apr 2014 20:53:43 +0000 Subject: SF.net SVN: gar:[23502] csw/mgar/pkg/nginx/trunk Message-ID: <3gFnfl2R8VzpD@mail.opencsw.org> Revision: 23502 http://sourceforge.net/p/gar/code/23502 Author: dmichelsen Date: 2014-04-25 20:53:40 +0000 (Fri, 25 Apr 2014) Log Message: ----------- nginx/trunk: Update to 1.6.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2014-04-25 12:50:02 UTC (rev 23501) +++ csw/mgar/pkg/nginx/trunk/Makefile 2014-04-25 20:53:40 UTC (rev 23502) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.5.9 +VERSION = 1.6.0 GARTYPE = v2 DESCRIPTION = HTTP server and mail proxy server Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2014-04-25 12:50:02 UTC (rev 23501) +++ csw/mgar/pkg/nginx/trunk/checksums 2014-04-25 20:53:40 UTC (rev 23502) @@ -1 +1 @@ -5fbde453d6bbc496f62a84412cd0bd8f nginx-1.5.9.tar.gz +8efa354f1c3c2ccf434a50d3fbe82340 nginx-1.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 25 22:59:25 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Apr 2014 20:59:25 +0000 Subject: SF.net SVN: gar:[23503] csw/mgar/pkg/doxygen/trunk Message-ID: <3gFnnh0M5kzsj@mail.opencsw.org> Revision: 23503 http://sourceforge.net/p/gar/code/23503 Author: dmichelsen Date: 2014-04-25 20:59:23 +0000 (Fri, 25 Apr 2014) Log Message: ----------- doxygen/trunk: Update to 1.8.7 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/doxygen/trunk/files/attachment-275069 Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2014-04-25 20:53:40 UTC (rev 23502) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2014-04-25 20:59:23 UTC (rev 23503) @@ -1,8 +1,5 @@ -# TODO: -# DONE: 1.8.6 does not compile yet as reported in https://bugzilla.gnome.org/show_bug.cgi?id=721479 -# NAME = doxygen -VERSION = 1.8.6 +VERSION = 1.8.7 GARTYPE = v2 DESCRIPTION = A documentation system for programming languages @@ -14,6 +11,10 @@ MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ DISTFILES = $(DISTNAME).src.tar.gz +# Replacement for configure script as reported here: +# https://bugzilla.gnome.org/show_bug.cgi?id=728654 +DISTFILES += attachment-275069 + VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/ LICENSE = LICENSE @@ -77,3 +78,9 @@ # some time... include gar/category.mk + +# Replacement for configure script as reported here: +# https://bugzilla.gnome.org/show_bug.cgi?id=728654 +post-extract: + cp $(WORKDIR)/attachment-275069 $(WORKSRC)/configure + @$(MAKECOOKIE) Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2014-04-25 20:53:40 UTC (rev 23502) +++ csw/mgar/pkg/doxygen/trunk/checksums 2014-04-25 20:59:23 UTC (rev 23503) @@ -1 +1 @@ -9385dc52f0627875f8fa758e754ec674 doxygen-1.8.6.src.tar.gz +ff0529df773301f63db82c25137b7fd8 doxygen-1.8.7.src.tar.gz Added: csw/mgar/pkg/doxygen/trunk/files/attachment-275069 =================================================================== --- csw/mgar/pkg/doxygen/trunk/files/attachment-275069 (rev 0) +++ csw/mgar/pkg/doxygen/trunk/files/attachment-275069 2014-04-25 20:59:23 UTC (rev 23503) @@ -0,0 +1,973 @@ +#!/bin/sh +# +# $Id$ +# +# Copyright (C) 1997-2014 by Dimitri van Heesch. +# +# Permission to use, copy, modify, and distribute this software and its +# documentation under the terms of the GNU General Public License is hereby +# granted. No representations are made about the suitability of this software +# for any purpose. It is provided "as is" without express or implied warranty. +# See the GNU General Public License for more details. +# +# Documents produced by Doxygen are derivative works derived from the +# input used in their production; they are not affected by this license. +# +# shell script to configure doxygen + +doxygen_version_major=1 +doxygen_version_minor=8 +doxygen_version_revision=7 + +#NOTE: Setting version_mmn to "NO" will omit mmn info from the package. +doxygen_version_mmn=NO + +bin_dirs=`echo $PATH | sed -e "s/:/ /g"` + +f_debug=NO +f_shared=YES +f_make=NO +f_dot=NO +f_perl=NO +f_python=NO +f_plf_auto=NO +f_prefix=/usr/local +f_insttool=NO +f_english=NO +f_wizard=NO +f_app=NO +f_doxmlparser=NO +f_thread=NO +f_flex=NO +f_bison=NO +f_search=NO +f_sqlite3=NO +f_sqlite3static=NO +f_sqlite3_path=NO +f_libclang=NO +f_libclangstatic=NO + +# +# first setup the list with availabe languages, so we cannot forget any +# list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script +# +f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ','` + +while test -n "$1"; do + case $1 in + --prefix=*) + f_prefix=`echo $1 | sed 's/^--prefix=//'` + ;; + --prefix | -prefix) + shift; f_prefix=$1 + ;; + --docdir=*) + f_docdir=`echo $1 | sed 's/^--docdir=//'` + ;; + --docdir | -docdir) + shift; f_docdir=$1 + ;; + --shared | -shared) + f_shared=YES + ;; + --static | -static) + f_shared=NO + ;; + --release | -release) + f_debug=NO + ;; + --debug | -debug) + f_debug=YES + ;; + --english-only | -english-only) + f_english=YES + ;; + --enable-langs=*) + f_langs=`echo $1 | sed 's/^--enable-langs=//'` + ;; + --enable-langs | -enable-langs) + shift; f_langs=$1 + ;; + --platform=*) + f_platform=`echo $1 | sed 's/^--platform=//'` + ;; + --platform | -platform) + shift; f_platform=$1 + ;; + --make=*) + f_make=`echo $1 | sed 's/^--make=//'` + ;; + --make | -make) + shift; f_make=$1 + ;; + --dot=*) + f_dot=`echo $1 | sed 's/^--dot=//'` + ;; + --dot | -dot) + shift; f_dot=$1 + ;; + --python=*) + f_python=`echo $1 | sed 's/^--python=//'` + ;; + --python | -python) + shift; f_python=$1 + ;; + --perl=*) + f_perl=`echo $1 | sed 's/^--perl=//'` + ;; + --perl | -perl) + shift; f_perl=$1 + ;; + --flex=*) + f_flex=`echo $1 | sed 's/^--flex=//'` + ;; + --flex | -flex) + shift; f_flex=$1 + ;; + --bison=*) + f_bison=`echo $1 | sed 's/^--bison=//'` + ;; + --bison | -bison) + shift; f_bison=$1 + ;; + --install=*) + f_insttool=`echo $1 | sed 's/^--install=//'` + ;; + --install | -install) + shift; f_insttool=$1 + ;; + --with-doxywizard | -with-doxywizard) + f_wizard=YES + ;; + --with-doxyapp | -with-doxyapp) + f_app=YES + ;; + --with-doxmlparser | -with-doxmlparser) + f_doxmlparser=YES + ;; + --with-doxysearch | -with-doxysearch) + f_search=YES + ;; + --with-sqlite3 | -with-sqlite3) + f_sqlite3=YES + ;; + --with-sqlite3-static | -with-sqlite3-static) + f_sqlite3=YES + f_sqlite3static=YES + ;; + --sqlite3-path=*) + f_sqlite3_path=`echo $1 | sed 's/^--sqlite3-path=//'` + ;; + --sqlite3-path | -sqlite3-path) + shift; f_sqlite3_path=$1 + ;; + --with-libclang | -with-libclang) + f_libclang=YES + ;; + --with-libclang-static | -with-libclang-static) + f_libclang=YES + f_libclangstatic=YES + ;; + -h | -help | --help) + f_help=y + ;; + *) + echo $1: unknown argument + f_help=y + f_error=y + ;; + esac + shift +done + +if test "$f_help" = y; then + cat </dev/null` || u_release=unknown +u_system=`(uname -s) 2>/dev/null` || u_system=unknown + +if test -z "$f_platform"; then + f_platforms="`cat PLATFORMS`" + + case "$u_system:$u_release" in + AIX*) + f_platform=aix-xlc + ;; + BeOS*) + f_platform=beos-g++ + ;; + dgux:*) + f_platform=dgux-g++ + ;; + Darwin:*) + f_platform=macosx-c++ + if test "$f_insttool" = NO; then + f_insttool=/usr/bin/install + fi + ;; + FreeBSD:*) + f_platform=freebsd-g++ + if test "$f_insttool" = NO; then + f_insttool=/usr/bin/install + fi + ;; + NetBSD:*) + f_platform=netbsd-g++ + if test "$f_insttool" = NO; then + f_insttool=/usr/bin/install + fi + ;; + HP-UX:*) + f_platform=hpux-g++ + if test "$f_insttool" = NO; then + f_insttool=/usr/bin/install + fi + ;; + IRIX64:*) + f_platform=irix-64 + ;; + IRIX:*) + f_platform=irix-n32 + ;; + Linux:*|GNU:*|GNU/*:*) + f_platform=linux-g++ + ;; + NetBSD:*) + f_platform=netbsd-g++ + ;; + OpenBSD:*) + f_platform=openbsd-g++ + ;; + OSF1:*) + f_platform=osf1-g++ + ;; + QNX:*) + f_platform=qnx-g++ + ;; + *:3.2) + f_platform=sco-g++ + ;; + SunOS:4*) + f_platform=sunos-g++ + ;; + SunOS:5*) + f_platform=solaris-g++ + if test "$f_insttool" = NO; then + f_insttool=/usr/bin/install + fi + ;; + ULTRIX:*) + f_platform=ultrix-g++ + ;; + UNIX_SV:4.2*) + f_platform=unixware-g++ + ;; + Cygwin:*|CYGWIN*) + f_platform=win32-g++ + ;; + MINGW32_NT*) + f_platform=win32-mingw + ;; + *MiNT:*) + f_platform=m68k-atari-mint-g++ + ;; + *) + echo + echo "Your platform was not recognised by this configure script" + echo "Please use the -platform option to specify one of platforms" + echo "in this list:" + echo + for p in $f_platforms + do + echo " $0 $* -platform $p" + done + echo + exit 2 + esac + echo " Autodetected platform $f_platform... " + f_plf_auto=YES +fi + +if test -z "$f_docdir"; then + f_docdir='$(INSTALL)/share/doc/packages/doxygen' +fi + +if test "$f_plf_auto" = NO; then + printf " Checking for platform $f_platform... " + if test '!' -d tmake/lib/$f_platform; then + echo "not supported!" + echo + exit 2 + fi + echo "supported" +fi + +#- check for qt -------------------------------------------------------------- + +if test "$f_wizard" = YES; then + if test -z "$QTDIR"; then + echo " QTDIR environment variable not set!" + printf " Checking for Qt..." + for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do + if test -x "$d/bin/qmake"; then + QTDIR=$d + break 2 + fi + done + else + if test -e "$QTDIR/bin/qmake"; then + printf " Detected Qt via the QTDIR environment variable..." + else + printf "ERROR Detected Qt via the QTDIR environment variable..." + echo ", but $QTDIR/bin/qmake does not exist." + echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." + exit 2 + fi + fi + if test -z "$QTDIR"; then + echo "QTDIR not set and Qt not found at standard locations!" + echo + echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." + echo "check the Qt installation instructions!" + exit 2 + fi + echo using $QTDIR +fi + +#- check for xapian ----------------------------------------------------------- + +if test "$f_search" = YES; then + if test -z "$XAPIAN"; then + printf " Checking for Xapian..." + for d in /usr /usr/local /opt/local; do + if test -e "$d/include/xapian.h"; then + XAPIAN=$d + break 2 + fi + done + else + if test -e "$XAPIAN/include/xapian.h"; then + printf " Detected Xapian via the XAPIAN environment variable..." + else + printf "ERROR Detected Xapian via the XAPIAN environment variable..." + echo ", but $XAPIAN/include/xapian.h does not exist." + echo " Set the XAPIAN environment variable such that \$XAPIAN/include/xapian.h exists." + exit 2 + fi + fi + if test -z "$XAPIAN"; then + echo "XAPIAN not set and xapian.h not found at standard locations!" + exit 2; + fi + echo using $XAPIAN +fi + +# - check for make ------------------------------------------------------------ + +printf " Checking for GNU make tool... " +if test "$f_make" = NO; then + make_names="gmake make" + make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" + make_prog=NO + for i in $make_names; do + for j in $make_dirs; do + if test -x "$j/$i"; then + if test -n "`$j/$i --version 2>/dev/null | grep GNU`"; then + make_prog="$j/$i" + break 2 + fi + fi + done + done + f_make="$make_prog" +fi + +if test "$f_make" = NO; then + echo "not found!"; + echo + exit 2 +fi +echo "using $f_make" + +# - check for install ------------------------------------------------------------ + +printf " Checking for GNU install tool... " +if test "$f_insttool" = NO; then + install_names="ginstall install" + install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb" + install_prog=NO + install_found=NO + for i in $install_names; do + for j in $install_dirs; do + if test -x "$j/$i"; then + if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then + install_found=YES + install_prog="$j/$i" + break 2 + fi + fi + done + done + f_insttool="$install_prog" +fi + +if test "$f_insttool" = NO; then + if test "$install_found" = YES; then + echo; + else + echo "not found!"; + echo + fi + echo "GNU version of install is required: this is part of the fileutils/coreutils package: " + echo "see http://www.gnu.org/software/fileutils/fileutils.html" + echo + exit 2 +fi +echo "using $f_insttool"; + + +# - check for dot ------------------------------------------------------------ + +printf " Checking for dot (part of GraphViz)... " +if test "$f_dot" = NO; then + dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" + dot_prog=NO + for j in $dot_dirs; do + if test -x "$j/dot"; then + dot_prog="$j/dot" + break 2 + fi + done + f_dot="$dot_prog" +fi + +if test "$f_dot" = NO; then + echo "not found!"; +else + echo "using $f_dot" +fi + +# - check for sqlite3 --------------------------------------------------------- + +if test "$f_sqlite3" = YES; then + printf " Checking for sqlite3 ... " + if test "$f_sqlite3_path" = NO; then + sqlite3_hdr_dir="/usr/include /usr/local/include /opt/local/include" + sqlite3_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/x86_64-linux-gnu /usr/lib64" + else + sqlite3_hdr_dir="$f_sqlite3_path/include" + sqlite3_lib_dir="$f_sqlite3_path/lib" + fi + if test "$f_sqlite3static" = NO; then + sqlite3_lib_name="libsqlite3.so libsqlite3.dylib libsqlite3.a libsqlite3.dll.a" + else + sqlite3_lib_name="libsqlite3.a" + fi + sqlite3_hdr=NO + sqlite3_lib=NO + sqlite3_link= + for j in $sqlite3_hdr_dir; do + if test -f "$j/sqlite3.h"; then + sqlite3_hdr="$j/sqlite3.h" + break + fi + done + for i in $sqlite3_lib_dir; do + if test "$sqlite3_lib" = NO; then + for j in $sqlite3_lib_name; do + if test -e "$i/$j"; then + if test "$f_sqlite3static" = NO; then + sqlite3_lib="$i/$j" + sqlite3_link="-L$i -lsqlite3" + else + sqlite3_lib="$i/$j" + sqlite3_link="$i/$j -ldl" + fi + break + fi + done + fi + done + if test "$sqlite3_hdr" = NO -o "$sqlite3_lib" = NO; then + echo "not found!"; + exit 1 + else + echo "using header $sqlite3_hdr and library $sqlite3_lib..."; + fi +fi + +# - check for libclang --------------------------------------------------------- + +if test "$f_libclang" = YES; then + printf " Checking for libclang ... " + libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include" + libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm" + if test "$f_libclangstatic" = NO; then + libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a" + else + libclang_lib_name="libclang.a" + fi + libclang_hdr=NO + libclang_lib=NO + libclang_link= + for j in $libclang_hdr_dir; do + if test -f "$j/clang-c/Index.h"; then + libclang_hdr="$j/clang-c/Index.h" + break + fi + done + for i in $libclang_lib_dir; do + if test "$libclang_lib" = NO; then + for j in $libclang_lib_name; do + if test -f "$i/$j"; then + libclang_lib="$i/$j" + if test "$f_libclangstatic" = NO; then + libclang_link="-L $i -lclang" + else + libclang_link="$i/libclang.a $i/libclangFrontend.a $i/libclangSerialization.a $i/libclangParse.a $i/libclangSema.a $i/libclangAnalysis.a $i/libclangStaticAnalyzerCore.a $i/libclangAST.a $i/libclangBasic.a $i/libclangDriver.a $i/libclangEdit.a $i/libclangLex.a $i/libclangRewriteCore.a $i/libLLVMBitReader.a $i/libLLVMMC.a $i/libLLVMMCParser.a $i/libLLVMSupport.a -ldl -lpthread" + fi + break + fi + done + fi + done + if test "$libclang_hdr" = NO -o "$libclang_lib" = NO; then + echo "not found!"; + else + echo "using header $libclang_hdr and library $libclang_lib..."; + fi +fi + +# - check for python ---------------------------------------------------------- + +printf " Checking for python... " +if test "$f_python" = NO; then + python_names="python2 python" + python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" + python_prog=NO + python_found=NO + for i in $python_names; do + for j in $python_dirs; do + if test -x "$j/$i"; then + python_found=YES + if test `$j/$i -c "import sys; print sys.version_info[0]"` = 2; then + python_prog="$j/$i" + break 2 + fi + fi + done + done + f_python="$python_prog" +fi + +if test "$f_python" = NO; then + if test "$python_found" = YES; then + echo "version should be python 2." + else + echo "not found!"; + fi + echo + exit 2 +fi +echo "using $f_python"; + +# - check for perl ------------------------------------------------------------ + +printf " Checking for perl... " +if test "$f_perl" = NO; then + perl_names="perl perl5" + perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" + perl_prog=NO + perl_found=NO + for i in $perl_names; do + for j in $perl_dirs; do + if test -x "$j/$i"; then + perl_found=YES + if $j/$i -e 'require 5.000;' 2>/dev/null ; then + perl_prog="$j/$i" + break 2 + fi + fi + done + done + f_perl="$perl_prog" +fi + +if test "$f_perl" = NO; then + if test "$perl_found" = YES; then + echo "version is too old (5.000 or higher is required)." + else + echo "not found!"; + fi + echo + exit 2 +fi +echo "using $f_perl"; + +# - check for flex ------------------------------------------------------------ + +printf " Checking for flex... " +if test "$f_flex" = NO; then + flex_dirs="$bin_dirs /usr/bin /usr/local/bin /bin" + flex_prog=NO + flex_found=NO + for j in $flex_dirs; do + if test -x "$j/flex"; then + flex_found=YES + flex_prog="$j/flex" + break + fi + done + f_flex="$flex_prog" +fi + +if test "$f_flex" = NO; then + echo "not found!"; + exit 2 +else + echo "using $f_flex" +fi + +# - check for bison ------------------------------------------------------------ + +printf " Checking for bison... " +if test "$f_bison" = NO; then + bison_dirs="$bin_dirs /usr/bin /usr/local/bin /bin" + bison_prog=NO + bison_found=NO + for j in $bison_dirs; do + if test -x "$j/bison"; then + bison_found=YES + bison_prog="$j/bison" + break + fi + done + f_bison="$bison_prog" +fi + +if test "$f_bison" = NO; then + echo "not found!"; + exit 2 +else + echo "using $f_bison" +fi + +# ----------------------------------------------------------------------------- + +mkdir -p generated_src/doxygen +if test "$f_wizard" = YES; then + mkdir -p generated_src/doxywizard +fi + +# +# Make VERSION file +# +test -f "VERSION" && chmod u+w VERSION +test -f "generated_src/doxygen/version.cpp" && chmod u+w generated_src/doxygen/version.cpp +echo " Generating generated_src/doxygen/version.cpp and VERSION..." +cd src +$f_python version.py ../generated_src/doxygen +cd .. +if test "$f_wizard" = YES; then + test -f "VERSION" && chmod u+w VERSION + test -f "generated_src/doxywizard/version.cpp" && chmod u+w generated_src/doxywizard/version.cpp + echo " Generating generated_src/doxywizard/version.cpp and VERSION..." + cd src + $f_python version.py ../generated_src/doxywizard + cd .. + +fi + +test -f .makeconfig && rm .makeconfig +test -f .tmakeconfig && rm .tmakeconfig + +configPWD=`pwd` + +cat > .makeconfig <> .makeconfig <> .makeconfig <> .makeconfig <> .makeconfig < spec.tmp +if test "$doxygen_version_mmn" = NO; then + echo "%define revision 1" >> spec.tmp + echo "%define mmn 1" >> spec.tmp +else + echo "%define revision $doxygen_version_mmn" >> spec.tmp + echo "%define mmn $doxygen_version_mmn" >> spec.tmp +fi + +mkdir -p packages +mkdir -p packages/rpm + +cat spec.tmp ./packages/rpm/doxygen.spec.in > ./packages/rpm/doxygen.spec + +rm -f spec.tmp + + +# make .tmakeconfig +# +touch .tmakeconfig +if test "$f_shared" = NO; then + if test "$f_platform" = "osf1-cxx" -o "$f_platform" = "irix-n32"; then + cat >> .tmakeconfig <> .tmakeconfig <> .tmakeconfig <> .tmakeconfig <> .tmakeconfig </dev/null`"; then + mac_sdk=MacOSX10.4u.sdk + fi + if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk 2>/dev/null`"; then + mac_sdk=MacOSX10.5.sdk + fi + if test -n $mac_sdk; then + cat >> .tmakeconfig <> .tmakeconfig <> .tmakeconfig < $DST <> $DST + if test $i = Makefile.in; then + echo "" >> $DST + EXTRADEPS= + if test $f_wizard = YES; then + EXTRADEPS=doxywizard + fi +# if test $f_search = YES; then +# EXTRADEPS="$EXTRADEPS doxysearch" +# fi + echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST + echo " \$(MAKE) -C qtools" >> $DST + echo " \$(MAKE) -C libmd5" >> $DST + echo " \$(MAKE) -C src" >> $DST + if test $f_wizard = YES; then + echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST + fi + if test $f_search = YES; then + echo " \$(MAKE) -C addon/doxysearch" >> $DST + fi + if test $f_app = YES; then + echo " \$(MAKE) -C addon/doxyapp" >> $DST + fi + if test $f_doxmlparser = YES; then + echo " \$(MAKE) -C addon/doxmlparser/src" >> $DST + echo " \$(MAKE) -C addon/doxmlparser/test" >> $DST + echo " \$(MAKE) -C addon/doxmlparser/examples/metrics" >> $DST + fi + echo "" >> $DST + echo "doxywizard_install:" >> $DST + if test $f_wizard = YES; then + echo " \$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard install" >> $DST + fi + echo "doxysearch_install:" >> $DST + if test $f_search = YES; then + echo " \$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxysearch install" >> $DST + fi + echo "" >> $DST + fi + if test $f_wizard = YES; then + sed -e "s/%%WITHDOXYWIZARD%% /--with doxywizard /g" $SRC >> $DST + else + sed -e "s/%%WITHDOXYWIZARD%% //g" $SRC >> $DST + fi + echo " Created $DST from $SRC..." +done + +cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t +cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t + +f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" + +for i in $f_inprofiles ; do + SRC=$i + DST=`echo $i|sed 's%\(.*\).in$%\1%'` + TIME=`date` + cat > $DST <> $DST + echo " Created $DST from $SRC..." +done + +# - generating generated_src/doxygen/doxygen/lang_cfg.h +# use consistent method on Linux and Windows + +if test -f "generated_src/doxygen/lang_cfg.h"; then + chmod u+w generated_src/doxygen/lang_cfg.h # make sure file can be overwritten +fi +echo " Generating generated_src/doxygen/lang_cfg.h..." +if test "$f_english" = YES; then + $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h +else + f_ulangs=`echo $f_langs | tr '[a-z,]' '[A-Z ]'` + $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h +fi + +if test -f "generated_src/doxygen/settings.h"; then + chmod u+w generated_src/doxygen/settings.h +fi +echo " Generating generated_src/doxygen/settings.h..." +$f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxygen + +if test "$f_wizard" = YES; then + if test -f "generated_src/doxywizard/settings.h"; then + chmod u+w generated_src/doxywizard/settings.h + fi + echo " Generating generated_src/doxywizard/settings.h..." + $f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxywizard +fi + +cd .. +echo " Finished" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Apr 25 23:18:26 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 25 Apr 2014 21:18:26 +0000 Subject: SF.net SVN: gar:[23504] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: <3gFpCG6V4JzyK@mail.opencsw.org> Revision: 23504 http://sourceforge.net/p/gar/code/23504 Author: jake_goerzen Date: 2014-04-25 21:18:24 +0000 (Fri, 25 Apr 2014) Log Message: ----------- dovecot: remove OBSOLETED_BY to disable creation of _stub package Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2014-04-25 20:59:23 UTC (rev 23503) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2014-04-25 21:18:24 UTC (rev 23504) @@ -28,9 +28,6 @@ SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecot-dev = Dovecot secure IMAP server header files -OBSOLETED_BY_CSWdovecot-dev = CSWdovecotdevel -CATALOGNAME_CSWdovecotdevel = dovecot_devel_stub - RUNTIME_DEP_PKGS_CSWdovecot += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibz1 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 Apr 25 23:37:45 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Apr 2014 21:37:45 +0000 Subject: SF.net SVN: gar:[23505] csw/mgar/pkg Message-ID: <3gFpdb2lYbz138@mail.opencsw.org> Revision: 23505 http://sourceforge.net/p/gar/code/23505 Author: dmichelsen Date: 2014-04-25 21:37:44 +0000 (Fri, 25 Apr 2014) Log Message: ----------- xtail/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/xtail/ csw/mgar/pkg/xtail/Makefile csw/mgar/pkg/xtail/branches/ csw/mgar/pkg/xtail/tags/ csw/mgar/pkg/xtail/trunk/ csw/mgar/pkg/xtail/trunk/Makefile csw/mgar/pkg/xtail/trunk/checksums csw/mgar/pkg/xtail/trunk/files/ Added: csw/mgar/pkg/xtail/Makefile =================================================================== --- csw/mgar/pkg/xtail/Makefile (rev 0) +++ csw/mgar/pkg/xtail/Makefile 2014-04-25 21:37:44 UTC (rev 23505) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/xtail/trunk =================================================================== --- csw/mgar/pkg/xtail/trunk 2014-04-25 21:18:24 UTC (rev 23504) +++ csw/mgar/pkg/xtail/trunk 2014-04-25 21:37:44 UTC (rev 23505) Property changes on: csw/mgar/pkg/xtail/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/xtail/trunk/Makefile =================================================================== --- csw/mgar/pkg/xtail/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xtail/trunk/Makefile 2014-04-25 21:37:44 UTC (rev 23505) @@ -0,0 +1,36 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xtail +VERSION = 2.1 +GARTYPE = v2 + +DESCRIPTION = Watch the growth of files + +MASTER_SITES += http://www.unicom.com/files/ +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += 20120219-patch-aalto.zip + +VENDOR_URL = http://www.unicom.com/sw/xtail + +# Package does not have a testsuite +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS += bindir +INSTALL_OVERRIDE_VARS += mandir +INSTALL_OVERRIDE_VAR_bindir = $(DESTDIR)$(bindir) +INSTALL_OVERRIDE_VAR_mandir = $(DESTDIR)$(mandir) + +include gar/category.mk + +# Apple patches contained in 20120219-patch-aalto.zip +post-extract: + cd $(WORKSRC) && gpatch -p1 < ../0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch + cd $(WORKSRC) && gpatch -p1 < ../0001-xtail.1-remove-SIGQUIT.patch + cd $(WORKSRC) && gpatch -p1 < ../xtail_2.1-5-debian-local-changes.patch + @$(MAKECOOKIE) + +pre-install: + ginstall -d -m 0755 $(DESTDIR)$(bindir) + ginstall -d -m 0755 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/xtail/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/xtail/trunk/checksums =================================================================== --- csw/mgar/pkg/xtail/trunk/checksums (rev 0) +++ csw/mgar/pkg/xtail/trunk/checksums 2014-04-25 21:37:44 UTC (rev 23505) @@ -0,0 +1,2 @@ +cf2fafe116e7f3bbff9adf7534b6a3f4 20120219-patch-aalto.zip +2e4717c591a2cbbd4aeb63d00c87a0cb xtail-2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 25 23:47:10 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Apr 2014 21:47:10 +0000 Subject: SF.net SVN: gar:[23506] csw/mgar/pkg Message-ID: <3gFprS0Gvvz19J@mail.opencsw.org> Revision: 23506 http://sourceforge.net/p/gar/code/23506 Author: wahwah Date: 2014-04-25 21:47:05 +0000 (Fri, 25 Apr 2014) Log Message: ----------- xvfb/trunk: Looks like it's a lot more work. Added Paths: ----------- csw/mgar/pkg/xvfb/ csw/mgar/pkg/xvfb/Makefile csw/mgar/pkg/xvfb/branches/ csw/mgar/pkg/xvfb/tags/ csw/mgar/pkg/xvfb/trunk/ csw/mgar/pkg/xvfb/trunk/Makefile csw/mgar/pkg/xvfb/trunk/checksums csw/mgar/pkg/xvfb/trunk/files/ Added: csw/mgar/pkg/xvfb/Makefile =================================================================== --- csw/mgar/pkg/xvfb/Makefile (rev 0) +++ csw/mgar/pkg/xvfb/Makefile 2014-04-25 21:47:05 UTC (rev 23506) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/xvfb/trunk =================================================================== --- csw/mgar/pkg/xvfb/trunk 2014-04-25 21:37:44 UTC (rev 23505) +++ csw/mgar/pkg/xvfb/trunk 2014-04-25 21:47:05 UTC (rev 23506) Property changes on: csw/mgar/pkg/xvfb/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/xvfb/trunk/Makefile =================================================================== --- csw/mgar/pkg/xvfb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xvfb/trunk/Makefile 2014-04-25 21:47:05 UTC (rev 23506) @@ -0,0 +1,36 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! So far, it looks like it's a lot more work. This particular version of +# Xorg requires lots of headers, and even though we only need to build xvfb, +# we might need to bring in more packages first before ./configure can +# complete. +# +# Or maybe we don't need the ./configure to complete to build just xvfb? + +NAME = xvfb +VERSION = 1.12.2 +GARTYPE = v2 + +DESCRIPTION = Brief description + +MASTER_SITES = ftp://ftp.fu-berlin.de/unix/X11/FTP.X.ORG/pub/X11R7.7/src/everything/ +DISTFILES = xorg-server-$(VERSION).tar.bz2 + +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-xorg +CONFIGURE_ARGS += --disable-xnest +CONFIGURE_ARGS += --disable-xwin +CONFIGURE_ARGS += --disable-standalone-xpbproxy +CONFIGURE_ARGS += --disable-dmx +CONFIGURE_ARGS += --disable-xres +CONFIGURE_ARGS += --disable-glx +CONFIGURE_ARGS += --disable-pciaccess +CONFIGURE_ARGS += --disable-dri +CONFIGURE_ARGS += --disable-dri2 + +WORKSRC = $(WORKDIR)/xorg-server-$(VERSION) + +include gar/category.mk Property changes on: csw/mgar/pkg/xvfb/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/xvfb/trunk/checksums =================================================================== --- csw/mgar/pkg/xvfb/trunk/checksums (rev 0) +++ csw/mgar/pkg/xvfb/trunk/checksums 2014-04-25 21:47:05 UTC (rev 23506) @@ -0,0 +1 @@ +791f0323b886abb7954de7f042bb7dc6 xorg-server-1.12.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 26 00:09:11 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Apr 2014 22:09:11 +0000 Subject: SF.net SVN: gar:[23507] csw/mgar/pkg/gpgme/trunk Message-ID: <3gFqKr48Klz1F0@mail.opencsw.org> Revision: 23507 http://sourceforge.net/p/gar/code/23507 Author: wahwah Date: 2014-04-25 22:09:09 +0000 (Fri, 25 Apr 2014) Log Message: ----------- gpgme/trunk: It builds. Let's refresh it. Modified Paths: -------------- csw/mgar/pkg/gpgme/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gpgme/trunk/files/changelog.CSW Property Changed: ---------------- csw/mgar/pkg/gpgme/trunk/Makefile Modified: csw/mgar/pkg/gpgme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gpgme/trunk/Makefile 2014-04-25 21:47:05 UTC (rev 23506) +++ csw/mgar/pkg/gpgme/trunk/Makefile 2014-04-25 22:09:09 UTC (rev 23507) @@ -1,3 +1,5 @@ +# $Id$ + NAME = gpgme VERSION = 1.4.3 GARTYPE = v2 @@ -14,7 +16,7 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gpgme/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -SPKG_SOURCEURL = http://www.gnupg.org/related_software/libraries.en.html#lib-GPGME +VENDOR_URL = http://www.gnupg.org/related_software/libraries.en.html#lib-GPGME GARCOMPILER = GCC4 Property changes on: csw/mgar/pkg/gpgme/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gpgme/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/gpgme/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/gpgme/trunk/files/changelog.CSW 2014-04-25 22:09:09 UTC (rev 23507) @@ -0,0 +1,6 @@ +gpgme (1.4.3,REV=2014.04.26) + + * Rebuild of the existing recipe. + + -- Maciej Blizinski Sat, 26 Apr 2014 00:03:08 +0200 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 26 00:29:48 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Apr 2014 22:29:48 +0000 Subject: SF.net SVN: gar:[23508] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: <3gFqnc11tXz1Jf@mail.opencsw.org> Revision: 23508 http://sourceforge.net/p/gar/code/23508 Author: wahwah Date: 2014-04-25 22:29:47 +0000 (Fri, 25 Apr 2014) Log Message: ----------- gcc4/trunk: Correct a missed libgo version upgrade Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-25 22:09:09 UTC (rev 23507) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-25 22:29:47 UTC (rev 23508) @@ -243,8 +243,8 @@ RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 PACKAGES += CSWlibgo5 -PKGFILES_CSWlibgo5 += $(call baseisadirs,$(libdir),libgo\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibgo5 += $(DESCRIPTION), libgo.so.4 +PKGFILES_CSWlibgo5 += $(call baseisadirs,$(libdir),libgo\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibgo5 += $(DESCRIPTION), libgo.so.5 RUNTIME_DEP_PKGS_CSWlibgo5 += CSWlibgcc-s1 # Hasn't been investigated. I feel lucky. CHECKPKG_OVERRIDES_CSWlibgo5 += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 26 02:07:57 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Apr 2014 00:07:57 +0000 Subject: SF.net SVN: gar:[23509] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: <3gFsz050jsz1RV@mail.opencsw.org> Revision: 23509 http://sourceforge.net/p/gar/code/23509 Author: wahwah Date: 2014-04-26 00:07:57 +0000 (Sat, 26 Apr 2014) Log Message: ----------- gcc4/trunk: Add CSWlibcilkrts5 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-25 22:29:47 UTC (rev 23508) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-26 00:07:57 UTC (rev 23509) @@ -280,6 +280,12 @@ SPKG_DESC_CSWlibatomic1 += $(DESCRIPTION), libatomic.so.1 RUNTIME_DEP_PKGS_CSWlibatomic1 += CSWlibgcc-s1 +PACKAGES += CSWlibcilkrts5 +CATALOGNAME_CSWlibcilkrts5 = libcilkrts5 +PKGFILES_CSWlibcilkrts5 += $(call baseisadirs,$(libdir),libcilkrts\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibcilkrts5 += $(DESCRIPTION), libcilkrts.so.5 +RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibcilkrts5 + PACKAGES += $(PKG_BASENAME)g++ SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler PKGFILES_$(PKG_BASENAME)g++ = $(foreach F,$(CXX_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 26 10:39:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Apr 2014 08:39:53 +0000 Subject: SF.net SVN: gar:[23510] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: <3gG5KY0fP2z83@mail.opencsw.org> Revision: 23510 http://sourceforge.net/p/gar/code/23510 Author: wahwah Date: 2014-04-26 08:39:50 +0000 (Sat, 26 Apr 2014) Log Message: ----------- gcc4/trunk: CSWlibcilkrts5 is an Intel-only package Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-26 00:07:57 UTC (rev 23509) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-26 08:39:50 UTC (rev 23510) @@ -280,11 +280,10 @@ SPKG_DESC_CSWlibatomic1 += $(DESCRIPTION), libatomic.so.1 RUNTIME_DEP_PKGS_CSWlibatomic1 += CSWlibgcc-s1 -PACKAGES += CSWlibcilkrts5 -CATALOGNAME_CSWlibcilkrts5 = libcilkrts5 +PACKAGES_i386 += CSWlibcilkrts5 PKGFILES_CSWlibcilkrts5 += $(call baseisadirs,$(libdir),libcilkrts\.so\.5(\.\d+)*) SPKG_DESC_CSWlibcilkrts5 += $(DESCRIPTION), libcilkrts.so.5 -RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibcilkrts5 +RUNTIME_DEP_PKGS_CSW$(PKG_BASENAME)core_i386 += CSWlibcilkrts5 PACKAGES += $(PKG_BASENAME)g++ SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 26 11:52:51 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Apr 2014 09:52:51 +0000 Subject: SF.net SVN: gar:[23511] csw/mgar/pkg Message-ID: <3gG6xm52bLzFF@mail.opencsw.org> Revision: 23511 http://sourceforge.net/p/gar/code/23511 Author: wahwah Date: 2014-04-26 09:52:48 +0000 (Sat, 26 Apr 2014) Log Message: ----------- humanize/trunk: Initial commit. Added Paths: ----------- csw/mgar/pkg/humanize/ csw/mgar/pkg/humanize/Makefile csw/mgar/pkg/humanize/branches/ csw/mgar/pkg/humanize/tags/ csw/mgar/pkg/humanize/trunk/ csw/mgar/pkg/humanize/trunk/Makefile csw/mgar/pkg/humanize/trunk/checksums csw/mgar/pkg/humanize/trunk/files/ csw/mgar/pkg/humanize/trunk/files/changelog.CSW Added: csw/mgar/pkg/humanize/Makefile =================================================================== --- csw/mgar/pkg/humanize/Makefile (rev 0) +++ csw/mgar/pkg/humanize/Makefile 2014-04-26 09:52:48 UTC (rev 23511) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/humanize/trunk =================================================================== --- csw/mgar/pkg/humanize/trunk 2014-04-26 08:39:50 UTC (rev 23510) +++ csw/mgar/pkg/humanize/trunk 2014-04-26 09:52:48 UTC (rev 23511) Property changes on: csw/mgar/pkg/humanize/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/humanize/trunk/Makefile =================================================================== --- csw/mgar/pkg/humanize/trunk/Makefile (rev 0) +++ csw/mgar/pkg/humanize/trunk/Makefile 2014-04-26 09:52:48 UTC (rev 23511) @@ -0,0 +1,19 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = humanize +VERSION = 0.5 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Human-readable numbers and dates + +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +TEST_SCRIPTS = + +ARCHALL_CSWpy-humanize = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/humanize/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/humanize/trunk/checksums =================================================================== --- csw/mgar/pkg/humanize/trunk/checksums (rev 0) +++ csw/mgar/pkg/humanize/trunk/checksums 2014-04-26 09:52:48 UTC (rev 23511) @@ -0,0 +1 @@ +2f00150400ae6a6e0e9767c18a3147cd humanize-0.5.tar.gz Added: csw/mgar/pkg/humanize/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/humanize/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/humanize/trunk/files/changelog.CSW 2014-04-26 09:52:48 UTC (rev 23511) @@ -0,0 +1,6 @@ +humanize (0.5,REV=2014.04.26) + + * Initial build. + + -- Maciej Blizinski Sat, 26 Apr 2014 11:52:33 +0200 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 26 11:54:34 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Apr 2014 09:54:34 +0000 Subject: SF.net SVN: gar:[23512] csw/mgar/pkg Message-ID: <3gG6zj5fH5zJY@mail.opencsw.org> Revision: 23512 http://sourceforge.net/p/gar/code/23512 Author: wahwah Date: 2014-04-26 09:54:32 +0000 (Sat, 26 Apr 2014) Log Message: ----------- humanize: move to lang-python mgar newpkg doesn't allow to create new packages in lang-python. Added Paths: ----------- csw/mgar/pkg/lang-python/humanize/ Removed Paths: ------------- csw/mgar/pkg/humanize/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Apr 26 13:23:44 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 26 Apr 2014 11:23:44 +0000 Subject: SF.net SVN: gar:[23513] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gG8yf19b9zQf@mail.opencsw.org> Revision: 23513 http://sourceforge.net/p/gar/code/23513 Author: claudio_sf Date: 2014-04-26 11:23:43 +0000 (Sat, 26 Apr 2014) Log Message: ----------- perl/trunk: Obsolete pkgs Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-26 09:54:32 UTC (rev 23512) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-26 11:23:43 UTC (rev 23513) @@ -1,5 +1,3 @@ -KIPTEST=1 - NAME = perl VERSION = 5.18.2 VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) @@ -22,8 +20,9 @@ # The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -PACKAGE = CSWperl -PKG_DESC = $(DESCRIPTION) +PACKAGES = CSWperl CSWperldoc +PKG_DESC_CSWperl = $(DESCRIPTION) +SPKG_DESC_CSWperl = $(DESCRIPTION) LICENSE = Copying # GCC build (Sunstudio is problematic) @@ -41,17 +40,17 @@ # Depends RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -INCOMPATIBLE_PKGS = CSWperlmods CSWpmdigest CSWpmi18nlangtags CSWperldoc OBSOLETED_BY_CSWperl += CSWperldoc -OBSOLETED_BY_CSWperl += CSWpm-module-build -OBSOLETED_BY_CSWperl += CSWpm-json-pp -OBSOLETED_BY_CSWperl += CSWpm-cpan-meta -OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta -OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml -OBSOLETED_BY_CSWperl += CSWpm-module-metadata +#OBSOLETED_BY_CSWperl += CSWpm-module-build +#OBSOLETED_BY_CSWperl += CSWpm-json-pp +#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta +#OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta +#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml +#OBSOLETED_BY_CSWperl += CSWpm-module-metadata CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub -OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements -OBSOLETED_BY_CSWperl += CSWpm-perl-ostype +#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements +#OBSOLETED_BY_CSWperl += CSWpm-perl-ostype +#INCOMPATIBLE_PKGS = CSWperldoc CSWpm-module-build CSWpm-json-pp CSWpm-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-cpan-meta-requirements CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content # Overridden because "/usr/ccs/bin/elfdump -y " returns output #CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.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 Sat Apr 26 15:28:26 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Apr 2014 13:28:26 +0000 Subject: SF.net SVN: gar:[23514] csw/mgar/gar/v2/lib/python Message-ID: <3gGCkc5mkJz13p@mail.opencsw.org> Revision: 23514 http://sourceforge.net/p/gar/code/23514 Author: wahwah Date: 2014-04-26 13:28:26 +0000 (Sat, 26 Apr 2014) Log Message: ----------- A script to notify inactive maintainers. It keeps some state on disk to avoid notifying the same people twice. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/activity.py csw/mgar/gar/v2/lib/python/maintainer_activity_report.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/notify_inactive_maintainers.py Modified: csw/mgar/gar/v2/lib/python/activity.py =================================================================== --- csw/mgar/gar/v2/lib/python/activity.py 2014-04-26 11:23:43 UTC (rev 23513) +++ csw/mgar/gar/v2/lib/python/activity.py 2014-04-26 13:28:26 UTC (rev 23514) @@ -3,6 +3,7 @@ import datetime import dateutil.parser import logging +import json from collections import namedtuple @@ -21,6 +22,14 @@ MAINTAINER_STOPLIST = [ 'orphaned', ] +# This should be moved to a better place. +MAINTAINER_WHITELIST = set([ + # People who haven't released packages in a long time, but are otherwise + # active. + 'claudio', + 'rmottola', + 'wbonnet', +]) def RevDeps(pkgs): revdeps = {} @@ -119,3 +128,16 @@ maintainers = ComputeMaintainerActivity(maintainers) return maintainers, bad_dates + + +# http://stackoverflow.com/questions/12122007/python-json-encoder-to-support-datetime +class DateTimeEncoder(json.JSONEncoder): + def default(self, obj): + if isinstance(obj, datetime.datetime): + return obj.isoformat() + elif isinstance(obj, datetime.date): + return obj.isoformat() + elif isinstance(obj, datetime.timedelta): + return (datetime.datetime.min + obj).time().isoformat() + else: + return super(DateTimeEncoder, self).default(obj) Modified: csw/mgar/gar/v2/lib/python/maintainer_activity_report.py =================================================================== --- csw/mgar/gar/v2/lib/python/maintainer_activity_report.py 2014-04-26 11:23:43 UTC (rev 23513) +++ csw/mgar/gar/v2/lib/python/maintainer_activity_report.py 2014-04-26 13:28:26 UTC (rev 23514) @@ -7,13 +7,14 @@ image of activity of a maintainer. """ -import logging -import requests import argparse +import cPickle import datetime import dateutil.parser import jinja2 -import cPickle +import json +import logging +import requests import concurrent.futures @@ -252,7 +253,8 @@ if username in maintainers: maintainers[username] = ( maintainers[username]._replace(csw_db_status=status, - date_created=date_created)) + date_created=date_created, + fullname=d['fullname'])) else: maintainers[username] = ( activity.Maintainer( @@ -311,7 +313,19 @@ counts=counts) outfd.write(rendered.encode('utf-8')) + # Save a JSON file too. + json_out = args.output + if json_out.endswith('.html'): + json_out = json_out[:-5] + '.json' + with open(json_out, 'w') as outfd: + json.dump(dict( + maintainers=maintainers, + maintainers_in_unstable=maintainers_in_unstable, + analysis_by_username=analysis_by_username, + counts=counts + ), outfd, cls=activity.DateTimeEncoder, indent=2) + if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG) main() Added: csw/mgar/gar/v2/lib/python/notify_inactive_maintainers.py =================================================================== --- csw/mgar/gar/v2/lib/python/notify_inactive_maintainers.py (rev 0) +++ csw/mgar/gar/v2/lib/python/notify_inactive_maintainers.py 2014-04-26 13:28:26 UTC (rev 23514) @@ -0,0 +1,153 @@ +#!/opt/csw/bin/python2.7 +# coding: utf-8 + +import anydbm +import datetime +import dateutil.parser +import jinja2 +import json +import logging +import os +import os.path +import requests +import smtplib +import textwrap + +from Cheetah import Template +from email.mime.text import MIMEText + +from lib.python import activity + +EMAIL_OF_PERSON_RUNNING_THIS_SCRIPT = '@opencsw.org' +PERSON_RUNNING_THIS_SCRIPT = 'Firstname Lastname' + +EMAIL_TMPL = """If you don't care about OpenCSW packages, +you can stop reading now. + +Hi {{ firstname }}, + +{% if maintainer.pkgs %} +It's been {{ time_ago }} since you last uploaded a package. +There still are packages in the unstable catalog that are owned by you. +{% else %} +{{ time_ago.capitalize() }} ago, you've signed up to be a package maintainer at +OpenCSW, but I looked in the unstable catalog, and I don't see any packages +from you in there. +{% endif %} + +What's the situation on your end, are you still interested in building packages +at OpenCSW? If so, please write back to me. If not, you can ignore this +message, and I will retire your account. This means that I will lock down your +buildfarm access, take away write access to the Subversion repository, and your + at opencsw.org email address will start bouncing messages. I won't delete your +home directory on the buildfarm. + +This is all reversible, if you wish to get your access back, write to +board at opencsw.org and your access will be restored. + +--Maciej +""" + +class Notifier(object): + + def __init__(self): + filename = os.path.join(os.environ['HOME'], + '.checkpkg', + 'retiring-notifications.db') + logging.info('Keeping state in %s', filename) + self.state = anydbm.open(filename, 'c') + + def Notify(self, address, subject, message): + # logging.info('Would send email to %s', address) + # print message + # return + address = address.encode('utf-8') + if address in self.state: + state = json.loads(self.state[address]) + logging.info('%s was already notified on %s', address, state['date']) + return + else: + state = { + 'address': address, + 'subject': subject, + 'message': message, + 'date': datetime.datetime.now(), + } + msg = MIMEText(message) + msg["Subject"] = subject + from_address = '%s <%s>' % (PERSON_RUNNING_THIS_SCRIPT, + EMAIL_OF_PERSON_RUNNING_THIS_SCRIPT) + msg['From'] = from_address + msg['To'] = address + msg['Bcc'] = EMAIL_OF_PERSON_RUNNING_THIS_SCRIPT + msg['Cc'] = 'OpenCSW board ' + s = smtplib.SMTP('mail.opencsw.org') + try: + logging.info('Sending email to %s', address) + addresses = [address, 'board at opencsw.org', + EMAIL_OF_PERSON_RUNNING_THIS_SCRIPT] + s.sendmail(from_address, + addresses, + msg.as_string()) + logging.debug("E-mail sending finished.") + self.state[address] = json.dumps(state, cls=activity.DateTimeEncoder) + except smtplib.SMTPRecipientsRefused as exc: + logging.warning( + "Sending email to %s failed: %s.", + repr(address), exc) + s.quit() + +def main(): + # This data can be generated on the fly, but for now we'll just use + # previously generated data. + url = 'http://buildfarm.opencsw.org/obsolete-pkgs/maintainer-activity.json' + data = requests.get(url).json() + maintainers = data['maintainers'] + analysis_by_username = data['analysis_by_username'] + notifier = Notifier() + for username in maintainers: + if username in activity.MAINTAINER_WHITELIST: + logging.debug('Skipping %s (is on the whitelist)', username) + continue + if not analysis_by_username[username]['to_retire']: + continue + maintainer = activity.Maintainer(*maintainers[username]) + logging.debug('to retire: %s / %s', maintainer.username, maintainer.fullname) + maintainer = maintainer._replace( + last_activity=dateutil.parser.parse(maintainer.last_activity)) + if maintainer.date_created: + maintainer = maintainer._replace( + date_created=dateutil.parser.parse(maintainer.date_created)) + else: + maintainer = maintainer._replace( + date_created=dateutil.parser.parse('1970-01-01')) + activity_date = max(maintainer.date_created, maintainer.last_activity) + months_ago = int((datetime.datetime.now() - activity_date).days / 30 + 0.5) + if months_ago > 12 * 20: + time_ago = 'some time' + elif months_ago > 12: + time_ago = 'about %d years' % ((months_ago + 6) / 12) + else: + time_ago = 'about %d months' % months_ago + + rendered_paragraphs = [] + assert maintainer.fullname is not None, ('Error in the DB somewhere, ' + 'check the maintainer table ' + 'in the CSW database on the ' + 'website') + for paragraph in EMAIL_TMPL.split('\n\n'): + template = jinja2.Template(paragraph) + rendered = template.render( + firstname=maintainer.fullname.split(' ')[0], + maintainer=maintainer, + time_ago=time_ago, + status=analysis_by_username[username]) + rendered_paragraphs.append(textwrap.fill(rendered.strip())) + message = '\n\n'.join(x.encode('utf-8') for x in rendered_paragraphs) + notifier.Notify('%s at opencsw.org' % username, + 'Cleanup of inactive maintainer accounts', message) + + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + main() 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 Apr 26 20:38:48 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 26 Apr 2014 18:38:48 +0000 Subject: SF.net SVN: gar:[23515] csw/mgar/pkg Message-ID: <3gGLcg4KKKz1Pg@mail.opencsw.org> Revision: 23515 http://sourceforge.net/p/gar/code/23515 Author: dmichelsen Date: 2014-04-26 18:38:47 +0000 (Sat, 26 Apr 2014) Log Message: ----------- libcheck/trunk: Initial try, testsuite does not run yet Added Paths: ----------- csw/mgar/pkg/libcheck/ csw/mgar/pkg/libcheck/Makefile csw/mgar/pkg/libcheck/branches/ csw/mgar/pkg/libcheck/tags/ csw/mgar/pkg/libcheck/trunk/ csw/mgar/pkg/libcheck/trunk/Makefile csw/mgar/pkg/libcheck/trunk/checksums csw/mgar/pkg/libcheck/trunk/files/ Added: csw/mgar/pkg/libcheck/Makefile =================================================================== --- csw/mgar/pkg/libcheck/Makefile (rev 0) +++ csw/mgar/pkg/libcheck/Makefile 2014-04-26 18:38:47 UTC (rev 23515) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libcheck/trunk =================================================================== --- csw/mgar/pkg/libcheck/trunk 2014-04-26 13:28:26 UTC (rev 23514) +++ csw/mgar/pkg/libcheck/trunk 2014-04-26 18:38:47 UTC (rev 23515) Property changes on: csw/mgar/pkg/libcheck/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libcheck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcheck/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcheck/trunk/Makefile 2014-04-26 18:38:47 UTC (rev 23515) @@ -0,0 +1,24 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = check +VERSION = 0.9.12 +GARTYPE = v2 + +DESCRIPTION = A unit test framework for C + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +# Needed for floor() +EXTRA_LINKER_FLAGS += -lm + +BUILD64 = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +# -pedantic is not rejected, but leads to _mcount not being defined, see for details +# http://wiki.opencsw.org/porting-faq#toc8 +CONFIGURE_ARGS += ax_cv_c_check_flag__pedantic=no + +include gar/category.mk + Property changes on: csw/mgar/pkg/libcheck/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libcheck/trunk/checksums =================================================================== --- csw/mgar/pkg/libcheck/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcheck/trunk/checksums 2014-04-26 18:38:47 UTC (rev 23515) @@ -0,0 +1 @@ +46fe540d1a03714c7a1967dbc6d484e7 check-0.9.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 26 20:48:28 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 26 Apr 2014 18:48:28 +0000 Subject: SF.net SVN: gar:[23516] csw/mgar/pkg Message-ID: <3gGLqn08GFz1XS@mail.opencsw.org> Revision: 23516 http://sourceforge.net/p/gar/code/23516 Author: dmichelsen Date: 2014-04-26 18:48:26 +0000 (Sat, 26 Apr 2014) Log Message: ----------- libavl/trunk: Initial commit, does not build yet Added Paths: ----------- csw/mgar/pkg/libavl/ csw/mgar/pkg/libavl/Makefile csw/mgar/pkg/libavl/branches/ csw/mgar/pkg/libavl/tags/ csw/mgar/pkg/libavl/trunk/ csw/mgar/pkg/libavl/trunk/Makefile csw/mgar/pkg/libavl/trunk/checksums csw/mgar/pkg/libavl/trunk/files/ Added: csw/mgar/pkg/libavl/Makefile =================================================================== --- csw/mgar/pkg/libavl/Makefile (rev 0) +++ csw/mgar/pkg/libavl/Makefile 2014-04-26 18:48:26 UTC (rev 23516) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libavl/trunk =================================================================== --- csw/mgar/pkg/libavl/trunk 2014-04-26 18:38:47 UTC (rev 23515) +++ csw/mgar/pkg/libavl/trunk 2014-04-26 18:48:26 UTC (rev 23516) Property changes on: csw/mgar/pkg/libavl/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libavl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libavl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libavl/trunk/Makefile 2014-04-26 18:48:26 UTC (rev 23516) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = avl +VERSION = 2.0.3 +GARTYPE = v2 + +DESCRIPTION = Binary search tree and balanced tree library + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://adtinfo.org + +BUILD64 = 1 + +# There is no configure +CONFIGURE_SCRIPTS = + +BUILD_ARGS += CC=$(CC) +BUILD_ARGS += CFLAGS="$(CFLAGS)" +BUILD_ARGS += LDFLAGS="$(LDFLAGS)" + +include gar/category.mk + Property changes on: csw/mgar/pkg/libavl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libavl/trunk/checksums =================================================================== --- csw/mgar/pkg/libavl/trunk/checksums (rev 0) +++ csw/mgar/pkg/libavl/trunk/checksums 2014-04-26 18:48:26 UTC (rev 23516) @@ -0,0 +1 @@ +96524052672e9ff50384d7e5381c1b08 avl-2.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Apr 26 22:16:26 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 26 Apr 2014 20:16:26 +0000 Subject: SF.net SVN: gar:[23517] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gGNnG0rjYz60@mail.opencsw.org> Revision: 23517 http://sourceforge.net/p/gar/code/23517 Author: claudio_sf Date: 2014-04-26 20:16:17 +0000 (Sat, 26 Apr 2014) Log Message: ----------- perl/trunk: Cleaning Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-26 18:48:26 UTC (rev 23516) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-26 20:16:17 UTC (rev 23517) @@ -41,15 +41,15 @@ RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 OBSOLETED_BY_CSWperl += CSWperldoc -#OBSOLETED_BY_CSWperl += CSWpm-module-build -#OBSOLETED_BY_CSWperl += CSWpm-json-pp -#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta -#OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta -#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml -#OBSOLETED_BY_CSWperl += CSWpm-module-metadata +OBSOLETED_BY_CSWperl += CSWpm-module-build +OBSOLETED_BY_CSWperl += CSWpm-json-pp +OBSOLETED_BY_CSWperl += CSWpm-cpan-meta +OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta +OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml +OBSOLETED_BY_CSWperl += CSWpm-module-metadata CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub -#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements -#OBSOLETED_BY_CSWperl += CSWpm-perl-ostype +OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements +OBSOLETED_BY_CSWperl += CSWpm-perl-ostype #INCOMPATIBLE_PKGS = CSWperldoc CSWpm-module-build CSWpm-json-pp CSWpm-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-cpan-meta-requirements CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content # Overridden because "/usr/ccs/bin/elfdump -y " returns output This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 27 12:40:43 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Apr 2014 10:40:43 +0000 Subject: SF.net SVN: gar:[23518] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: <3gGlyf2CHDzfh@mail.opencsw.org> Revision: 23518 http://sourceforge.net/p/gar/code/23518 Author: wahwah Date: 2014-04-27 10:40:40 +0000 (Sun, 27 Apr 2014) Log Message: ----------- gcc4/trunk: Dependencies for CSWlibcilkrts5 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-26 20:16:17 UTC (rev 23517) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-27 10:40:40 UTC (rev 23518) @@ -270,9 +270,10 @@ RUNTIME_DEP_PKGS_CSWlibquadmath0 += CSWlibgcc-s1 # Dependencies only on Intel +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386 += CSWlibcilkrts5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386 += CSWlibquadmath0 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)) RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)) RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH)) PACKAGES += CSWlibatomic1 @@ -283,7 +284,8 @@ PACKAGES_i386 += CSWlibcilkrts5 PKGFILES_CSWlibcilkrts5 += $(call baseisadirs,$(libdir),libcilkrts\.so\.5(\.\d+)*) SPKG_DESC_CSWlibcilkrts5 += $(DESCRIPTION), libcilkrts.so.5 -RUNTIME_DEP_PKGS_CSW$(PKG_BASENAME)core_i386 += CSWlibcilkrts5 +RUNTIME_DEP_PKGS_CSWlibcilkrts5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibcilkrts5 += CSWlibstdc++6 PACKAGES += $(PKG_BASENAME)g++ SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 27 12:46:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Apr 2014 10:46:53 +0000 Subject: SF.net SVN: gar:[23519] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: <3gGm5d27fJzk7@mail.opencsw.org> Revision: 23519 http://sourceforge.net/p/gar/code/23519 Author: wahwah Date: 2014-04-27 10:46:53 +0000 (Sun, 27 Apr 2014) Log Message: ----------- gcc4/trunk: no-direct-binding override for CSWlibcilkrts5. I know what flags to pass, but this is the GCC build system. Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-27 10:40:40 UTC (rev 23518) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-04-27 10:46:53 UTC (rev 23519) @@ -286,6 +286,8 @@ SPKG_DESC_CSWlibcilkrts5 += $(DESCRIPTION), libcilkrts.so.5 RUNTIME_DEP_PKGS_CSWlibcilkrts5 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibcilkrts5 += CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSWlibcilkrts5 += no-direct-binding|/opt/csw/lib/amd64/libcilkrts.so.5.0.0|is|not|directly|bound|to|soname|libstdc++.so.6 +CHECKPKG_OVERRIDES_CSWlibcilkrts5 += no-direct-binding|/opt/csw/lib/libcilkrts.so.5.0.0|is|not|directly|bound|to|soname|libstdc++.so.6 PACKAGES += $(PKG_BASENAME)g++ SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Apr 28 00:46:23 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 27 Apr 2014 22:46:23 +0000 Subject: SF.net SVN: gar:[23520] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gH43s17qFz1Dj@mail.opencsw.org> Revision: 23520 http://sourceforge.net/p/gar/code/23520 Author: claudio_sf Date: 2014-04-27 22:46:19 +0000 (Sun, 27 Apr 2014) Log Message: ----------- perl/trunk: Cleaning up Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-27 10:46:53 UTC (rev 23519) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-27 22:46:19 UTC (rev 23520) @@ -20,7 +20,7 @@ # The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -PACKAGES = CSWperl CSWperldoc +PACKAGES = CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) SPKG_DESC_CSWperl = $(DESCRIPTION) LICENSE = Copying @@ -40,16 +40,16 @@ # Depends RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -OBSOLETED_BY_CSWperl += CSWperldoc -OBSOLETED_BY_CSWperl += CSWpm-module-build -OBSOLETED_BY_CSWperl += CSWpm-json-pp -OBSOLETED_BY_CSWperl += CSWpm-cpan-meta -OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta -OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml -OBSOLETED_BY_CSWperl += CSWpm-module-metadata +OBSOLETED_BY_CSWperl += CSWperldoc CSWpm-parse-cpan-meta CSWpm-cpan-meta CSWpm-cpan-meta-requirements CSWpm-perl-ostype CSWpm-cpan-meta-yaml CSWpm-module-build CSWpm-json-pp CSWpm-module-metadata +#OBSOLETED_BY_CSWperl += CSWpm-module-build +#OBSOLETED_BY_CSWperl += CSWpm-json-pp +#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta +#OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta +#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml +#OBSOLETED_BY_CSWperl += CSWpm-module-metadata CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub -OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements -OBSOLETED_BY_CSWperl += CSWpm-perl-ostype +#OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements +#OBSOLETED_BY_CSWperl += CSWpm-perl-ostype #INCOMPATIBLE_PKGS = CSWperldoc CSWpm-module-build CSWpm-json-pp CSWpm-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-cpan-meta-requirements CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content # Overridden because "/usr/ccs/bin/elfdump -y " returns output This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Apr 28 01:12:43 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 27 Apr 2014 23:12:43 +0000 Subject: SF.net SVN: gar:[23521] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gH4fC720Sz1JL@mail.opencsw.org> Revision: 23521 http://sourceforge.net/p/gar/code/23521 Author: claudio_sf Date: 2014-04-27 23:12:42 +0000 (Sun, 27 Apr 2014) Log Message: ----------- perl/trunk: Bogus deps Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-27 22:46:19 UTC (rev 23520) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-27 23:12:42 UTC (rev 23521) @@ -52,6 +52,16 @@ #OBSOLETED_BY_CSWperl += CSWpm-perl-ostype #INCOMPATIBLE_PKGS = CSWperldoc CSWpm-module-build CSWpm-json-pp CSWpm-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-cpan-meta-requirements CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWpm-parse-cpan-meta += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-cpan-meta += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-cpan-meta-requirements += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-perl-ostype += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-cpan-meta-yaml += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-module-build += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-json-pp += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-module-metadata += surplus-dependency|CSWperl + # Overridden because "/usr/ccs/bin/elfdump -y " returns output #CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.1 #CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libssp.so.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Apr 28 23:42:43 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 28 Apr 2014 21:42:43 +0000 Subject: SF.net SVN: gar:[23522] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gHfc32bnwzW5@mail.opencsw.org> Revision: 23522 http://sourceforge.net/p/gar/code/23522 Author: claudio_sf Date: 2014-04-28 21:42:42 +0000 (Mon, 28 Apr 2014) Log Message: ----------- perl/trunk: Remove overrides Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-27 23:12:42 UTC (rev 23521) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-28 21:42:42 UTC (rev 23522) @@ -53,6 +53,7 @@ #INCOMPATIBLE_PKGS = CSWperldoc CSWpm-module-build CSWpm-json-pp CSWpm-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-cpan-meta-requirements CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWpm-module-metadata += file-with-bad-content CHECKPKG_OVERRIDES_CSWpm-parse-cpan-meta += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWpm-cpan-meta += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWpm-cpan-meta-requirements += surplus-dependency|CSWperl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Tue Apr 29 10:59:11 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Tue, 29 Apr 2014 08:59:11 +0000 Subject: SF.net SVN: gar:[23523] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: <3gHxcS5KHrz12R@mail.opencsw.org> Revision: 23523 http://sourceforge.net/p/gar/code/23523 Author: guillomovitch Date: 2014-04-29 08:59:10 +0000 (Tue, 29 Apr 2014) Log Message: ----------- fusioninventory-agent/trunk: new version 2.3.7 Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/checksums Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-04-28 21:42:42 UTC (rev 23522) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-04-29 08:59:10 UTC (rev 23523) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.6 +VERSION = 2.3.7 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-04-28 21:42:42 UTC (rev 23522) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-04-29 08:59:10 UTC (rev 23523) @@ -1 +1 @@ -2f7278786e67da475ee2eb5f2276f7f7 FusionInventory-Agent-2.3.6.tar.gz +d5d1cbd7ea628a626ad5d3d4f77efd17 FusionInventory-Agent-2.3.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 Apr 29 11:20:37 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Apr 2014 09:20:37 +0000 Subject: SF.net SVN: gar:[23524] csw/mgar/pkg/php5/branches/php-5.5.x Message-ID: <3gHy5K68gGz1DY@mail.opencsw.org> Revision: 23524 http://sourceforge.net/p/gar/code/23524 Author: dmichelsen Date: 2014-04-29 09:20:37 +0000 (Tue, 29 Apr 2014) Log Message: ----------- php5/branches/php-5.5.x: Several fixes Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile csw/mgar/pkg/php5/branches/php-5.5.x/checksums Added Paths: ----------- csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-04-29 08:59:10 UTC (rev 23523) +++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-04-29 09:20:37 UTC (rev 23524) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.5.10 +VERSION = 5.5.11 GARTYPE = v2 DESCRIPTION = A high-level scripting language. @@ -27,7 +27,7 @@ AP2_MODFILES = *libphp5.so # at least for a decent echo used during build. -PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) +# PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) MASTER_SITES += http://de1.php.net/distributions/ # SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') @@ -45,7 +45,9 @@ DISTFILES += CSWap2-modphp5.preremove DISTFILES += httpd-php5.conf +# We probably need this, verify # PATCHFILES += 0001-Strip-usr-ucblib-references.patch + PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch # TBD: Where specifically do these come from? @@ -55,6 +57,10 @@ PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch PATCHFILES += 0005-Remove-another-Wno.patch +# Use patch for correct alignment. See for details +# http://lists.opencsw.org/pipermail/maintainers/2014-March/019106.html +PATCHFILES += 0001-Align-correctly.patch + BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib-dev CSWlibgdbm-dev CSWlibgmp10 @@ -82,16 +88,23 @@ OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1)) PKGFILES_CSWphp5-$(subst _,-,$(1)) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5 +RUNTIME_DEP_PKGS_sparc_CSWphp5-$(subst _,-,$(1)) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) += $(RUNTIME_DEP_PKGS_$(GARCH)_CSWphp5-$(subst _,-,$(1))) endef PACKAGES = CSWphp5 CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1 -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio52 INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 +# This is an example +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1 # embeded 'magic' information to detect file types...odd, but... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php @@ -135,9 +148,11 @@ CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio52 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc52 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 @@ -153,7 +168,7 @@ PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif,)) $(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0)) -$(eval $(call php5_subpackage,gd,CSWlibgd2 CSWlibt1-5)) +$(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibxpm4 CSWlibt1-5)) PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8)) $(eval $(call php5_subpackage,gmp,CSWlibgmp10)) @@ -211,7 +226,7 @@ $(eval $(call php5_subpackage,sysvmsg,)) $(eval $(call php5_subpackage,sysvsem,)) $(eval $(call php5_subpackage,sysvshm,)) -$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99)) +$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99-0)) $(eval $(call php5_subpackage,tokenizer,)) $(eval $(call php5_subpackage,wddx,)) $(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) @@ -219,7 +234,7 @@ $(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2)) $(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0)) $(eval $(call php5_subpackage,zip,CSWlibz1)) -$(eval $(call php5_subpackage,ibm_db2,)) +#$(eval $(call php5_subpackage,ibm_db2,)) # Use reinplacement until this is fixed: # https://bugs.php.net/bug.php?id=66298 @@ -251,15 +266,15 @@ EXTRA_CONFIGURE_EXPORTS += DB2DIR # This is needed for DB2 module -CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include -CONFIGURE_ENV_IBM_DB_LIB = /opt/IBM/db2/V8.1/lib -CONFIGURE_ENV_DB2INSTANCE = db2inst1 -CONFIGURE_ENV_DB2DIR = /opt/IBM/db2/V8.1 +# Disable DB2 for now as the -R gets into *every* module with the latest linker anomalies +#CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include +#CONFIGURE_ENV_IBM_DB_LIB = /opt/IBM/db2/V8.1/lib +#CONFIGURE_ENV_DB2INSTANCE = db2inst1 +#CONFIGURE_ENV_DB2DIR = /opt/IBM/db2/V8.1 -EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB) +#EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB) # We need CMSG_SPACE -# EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ EXTRA_CFLAGS += -D_XPG4_2 -D__EXTENSIONS__ sysconfdir = /etc$(prefix)/php5 @@ -317,7 +332,7 @@ CONFIGURE_ARGS += --with-gdbm=$(prefix) CONFIGURE_ARGS += --with-gettext=shared,$(prefix) CONFIGURE_ARGS += --with-gmp=shared,$(prefix) -CONFIGURE_ARGS += --with-ibm-db2=shared,/export/db2inst1/sqllib +#CONFIGURE_ARGS += --with-ibm-db2=shared,/export/db2inst1/sqllib CONFIGURE_ARGS += --with-iconv=shared,$(prefix) CONFIGURE_ARGS += --with-imap-ssl=$(prefix) CONFIGURE_ARGS += --with-imap=shared,$(prefix) Modified: csw/mgar/pkg/php5/branches/php-5.5.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-04-29 08:59:10 UTC (rev 23523) +++ csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-04-29 09:20:37 UTC (rev 23524) @@ -1 +1 @@ -d608230c7890b6a0cc5b92e66e866226 php-5.5.10.tar.bz2 +c8c9ad960bae0265054b5879423f7a75 php-5.5.11.tar.bz2 Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch (rev 0) +++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch 2014-04-29 09:20:37 UTC (rev 23524) @@ -0,0 +1,25 @@ +From 4962fb7a6d1029a67f231aa8760ef61b1363a93e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 1 Apr 2014 14:10:25 +0200 +Subject: [PATCH] Align correctly + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index fee4bdf..08355c3 100755 +--- a/configure ++++ b/configure +@@ -5443,7 +5443,7 @@ case $host_cpu in + ;; + sparc*) + if test "$SUNCC" = "yes"; then +- CFLAGS="$CFLAGS -xmemalign=8s" ++ CFLAGS="$CFLAGS -xmemalign=8i" + fi + ;; + esac +-- +1.8.4.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 Tue Apr 29 11:21:32 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Apr 2014 09:21:32 +0000 Subject: SF.net SVN: gar:[23525] csw/mgar/pkg/php5/branches/php-5.6.x Message-ID: <3gHy6D5vZJz1Hm@mail.opencsw.org> Revision: 23525 http://sourceforge.net/p/gar/code/23525 Author: dmichelsen Date: 2014-04-29 09:21:32 +0000 (Tue, 29 Apr 2014) Log Message: ----------- php5/branches/php-5.6.x: Update to 5.6-201404160230 Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile csw/mgar/pkg/php5/branches/php-5.6.x/checksums Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2014-04-29 09:20:37 UTC (rev 23524) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2014-04-29 09:21:32 UTC (rev 23525) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.6.0alpha3 +VERSION = 5.6-201404160230 GARTYPE = v2 DESCRIPTION = A high-level scripting language. @@ -31,6 +31,7 @@ MASTER_SITES += http://de1.php.net/distributions/ MASTER_SITES += http://downloads.php.net/tyrael/ +MASTER_SITES += http://snaps.php.net/ # SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR) @@ -38,6 +39,7 @@ VENDOR_URL = http://www.php.net/ LICENSE = LICENSE +DISTNAME = $(NAME)$(VERSION) DISTFILES += $(DISTNAME).tar.xz DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes @@ -380,7 +382,7 @@ # they're using git now and ship a .gitignore that excludes aclocal.m4 # that broke one of our patches so we'll nuke .gitignore before we patch pre-patch-modulated: - @(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' ) + @-(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' ) @$(MAKECOOKIE) xxxxpre-configure-modulated: Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2014-04-29 09:20:37 UTC (rev 23524) +++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2014-04-29 09:21:32 UTC (rev 23525) @@ -1 +1 @@ -57d9317dab2e8eab962990ff0c5ea70a php-5.6.0alpha3.tar.xz +70f03bbab8a96f4edc97fa230df4032b php5.6-201404160230.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Apr 29 13:17:34 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 29 Apr 2014 11:17:34 +0000 Subject: SF.net SVN: gar:[23526] csw/mgar/pkg/perl/trunk/files Message-ID: <3gJ0h93Bjcz1TF@mail.opencsw.org> Revision: 23526 http://sourceforge.net/p/gar/code/23526 Author: claudio_sf Date: 2014-04-29 11:17:33 +0000 (Tue, 29 Apr 2014) Log Message: ----------- perl/trunk: Remove old files on svn Removed Paths: ------------- csw/mgar/pkg/perl/trunk/files/sigsystem.t csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch csw/mgar/pkg/perl/trunk/files/updatecore.mk Deleted: csw/mgar/pkg/perl/trunk/files/sigsystem.t =================================================================== --- csw/mgar/pkg/perl/trunk/files/sigsystem.t 2014-04-29 09:21:32 UTC (rev 23525) +++ csw/mgar/pkg/perl/trunk/files/sigsystem.t 2014-04-29 11:17:33 UTC (rev 23526) @@ -1,69 +0,0 @@ -#!perl -w - -BEGIN { - require './test.pl'; - skip_all_if_miniperl(); - skip_all_without_config(qw(d_fork)); -} - -use strict; -use constant TRUE => ($^X, '-e', 'exit 0'); -use Data::Dumper; - -plan tests => 4; - -SKIP: { - skip 'Platform doesn\'t support SIGCHLD', 4 if not exists $SIG{CHLD}; - require POSIX; - require Time::HiRes; - - my @pids; - $SIG{CHLD} = sub { - while ((my $child = waitpid(-1, POSIX::WNOHANG())) > 0) { - note "Reaped: $child"; - push @pids, $child; - } - }; - my $pid = fork // die "Can't fork: $!"; - unless ($pid) { - note("Child PID: $$"); - Time::HiRes::sleep(0.250); - POSIX::_exit(0); - } - - test_system('without reaper'); - - my $current = POSIX::SigSet->new; - POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); - diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); - test_system('with reaper'); - POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); - diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); - - note("Waiting briefly for SIGCHLD..."); - Time::HiRes::sleep(0.500); - - ok(@pids == 1, 'Reaped only one process'); - ok($pids[0] == $pid, "Reaped the right process.") or diag(Dumper(\@pids)); -} - -sub test_system { - my $subtest = shift; - - my $expected_zeroes = 10; - my $got_zeroes = 0; - - # This test is looking for a race between system()'s waitpid() and a - # signal handler. Looping a few times increases the chances of - # catching the error. - - for (1..$expected_zeroes) { - $got_zeroes++ unless system(TRUE); - } - - is( - $got_zeroes, $expected_zeroes, - "system() $subtest succeeded $got_zeroes times out of $expected_zeroes" - ); -} - Deleted: csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch =================================================================== --- csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch 2014-04-29 09:21:32 UTC (rev 23525) +++ csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch 2014-04-29 11:17:33 UTC (rev 23526) @@ -1,39 +0,0 @@ -diff --git a/t/op/sigsystem.t b/t/op/sigsystem.t -index 197ecb2..dcbbab1 100644 ---- a/t/op/sigsystem.t -+++ b/t/op/sigsystem.t -@@ -17,6 +17,13 @@ SKIP: { - require POSIX; - require Time::HiRes; - -+ my @pids; -+ $SIG{CHLD} = sub { -+ while ((my $child = waitpid(-1, POSIX::WNOHANG())) > 0) { -+ note "Reaped: $child"; -+ push @pids, $child; -+ } -+ }; - my $pid = fork // die "Can't fork: $!"; - unless ($pid) { - note("Child PID: $$"); -@@ -26,15 +33,12 @@ SKIP: { - - test_system('without reaper'); - -- my @pids; -- $SIG{CHLD} = sub { -- while ((my $child = waitpid(-1, POSIX::WNOHANG())) > 0) { -- note "Reaped: $child"; -- push @pids, $child; -- } -- }; -- -+ my $current = POSIX::SigSet->new; -+ POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); -+ diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); - test_system('with reaper'); -+ POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); -+ diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); - - note("Waiting briefly for SIGCHLD..."); - Time::HiRes::sleep(0.500); Deleted: csw/mgar/pkg/perl/trunk/files/updatecore.mk =================================================================== --- csw/mgar/pkg/perl/trunk/files/updatecore.mk 2014-04-29 09:21:32 UTC (rev 23525) +++ csw/mgar/pkg/perl/trunk/files/updatecore.mk 2014-04-29 11:17:33 UTC (rev 23526) @@ -1,22 +0,0 @@ -# Rules for updating modules in the Perl core - -# Install core updates -install-core-updates: remove-obsolete-modules - @for d in "" $(CORE_UPDATES) ; do \ - test -z "$$d" && continue ; \ - echo " ==> Applying core update: $$d" ; \ - ( cd $(WORKDIR)/$$d ; \ - $(CONFIGURE_ENV) perl Makefile.PL ; \ - $(BUILD_ENV) make ; \ - $(TEST_ENV) make test ; \ - $(INSTALL_ENV) make install INSTALLDIRS=perl DESTDIR=$(DESTDIR) ) ; \ - done - @$(MAKECOOKIE) - -# Remove obsolete modules -remove-obsolete-modules: - @echo " ==> Removing obsolete modules" - @( cd $(DESTDIR)$(datadir)/perl/$(VERSION) ; \ - grm -vrf $(CORE_OBSOLETE) ) - @$(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 Wed Apr 30 08:16:12 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Apr 2014 06:16:12 +0000 Subject: SF.net SVN: gar:[23527] csw/mgar/pkg/tmux/trunk/Makefile Message-ID: <3gJTy239Nzz16l@mail.opencsw.org> Revision: 23527 http://sourceforge.net/p/gar/code/23527 Author: dmichelsen Date: 2014-04-30 06:16:11 +0000 (Wed, 30 Apr 2014) Log Message: ----------- tmux/trunk: Add comment about #5165 and rationale for gcc Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2014-04-29 11:17:33 UTC (rev 23526) +++ csw/mgar/pkg/tmux/trunk/Makefile 2014-04-30 06:16:11 UTC (rev 23527) @@ -13,6 +13,8 @@ BUILD_DEP_PKGS = CSWlibevent-dev +# Switch to gcc, Sun Studio is causing core dumps: +# https://www.opencsw.org/mantis/view.php?id=5165 GARCOMPILER = GNU RUNTIME_DEP_PKGS = CSWlibevent2-0-5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Wed Apr 30 13:27:19 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Wed, 30 Apr 2014 11:27:19 +0000 Subject: SF.net SVN: gar:[23528] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: <3gJcrv0QwwzJ8@mail.opencsw.org> Revision: 23528 http://sourceforge.net/p/gar/code/23528 Author: guillomovitch Date: 2014-04-30 11:27:17 +0000 (Wed, 30 Apr 2014) Log Message: ----------- fusioninventory-agent/trunk: new version 2.3.7.1 Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/checksums Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-04-30 06:16:11 UTC (rev 23527) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-04-30 11:27:17 UTC (rev 23528) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.7 +VERSION = 2.3.7.1 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-04-30 06:16:11 UTC (rev 23527) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-04-30 11:27:17 UTC (rev 23528) @@ -1 +1 @@ -d5d1cbd7ea628a626ad5d3d4f77efd17 FusionInventory-Agent-2.3.7.tar.gz +a785e4206c4f03eb4bd031d9c91a9106 FusionInventory-Agent-2.3.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Apr 30 16:03:50 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 30 Apr 2014 14:03:50 +0000 Subject: SF.net SVN: gar:[23529] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gJhKT6Kz1z1XW@mail.opencsw.org> Revision: 23529 http://sourceforge.net/p/gar/code/23529 Author: claudio_sf Date: 2014-04-30 14:03:49 +0000 (Wed, 30 Apr 2014) Log Message: ----------- perl/trunk: Sunstudio works now. Removal of warning comment Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-04-30 11:27:17 UTC (rev 23528) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-04-30 14:03:49 UTC (rev 23529) @@ -25,7 +25,7 @@ SPKG_DESC_CSWperl = $(DESCRIPTION) LICENSE = Copying -# GCC build (Sunstudio is problematic) +# GCC build (Sun Studio build has been fixed) GARCOMPILER = GCC4 MAKE_OPT_unstable10s = -j 24 MAKE_OPT_unstable10x = -j 4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.