From dmichelsen at users.sourceforge.net Tue Sep 5 13:50:22 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Sep 2017 11:50:22 +0000 Subject: SF.net SVN: gar:[26276] csw/mgar/pkg/nginx/trunk Message-ID: <1504612222.252845.17583@sfp-scm-8.v30.ch3.sourceforge.com> Revision: 26276 http://sourceforge.net/p/gar/code/26276 Author: dmichelsen Date: 2017-09-05 11:50:21 +0000 (Tue, 05 Sep 2017) Log Message: ----------- nginx/trunk: Update to 1.13.4 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2017-08-30 20:06:15 UTC (rev 26275) +++ csw/mgar/pkg/nginx/trunk/Makefile 2017-09-05 11:50:21 UTC (rev 26276) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.13.0 +VERSION = 1.13.4 GARTYPE = v2 DESCRIPTION = HTTP server and mail proxy server Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2017-08-30 20:06:15 UTC (rev 26275) +++ csw/mgar/pkg/nginx/trunk/checksums 2017-09-05 11:50:21 UTC (rev 26276) @@ -1 +1 @@ -0ff7057465d5622c5b1279e91b273e96 nginx-1.13.0.tar.gz +42a3ca70cd292a149ba4f60862599245 nginx-1.13.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 8 13:40:36 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 Sep 2017 11:40:36 +0000 Subject: SF.net SVN: gar:[26277] csw/mgar/pkg/mod_auth_kerb/trunk Message-ID: <1504870836.490448.31314@sfp-scm-6.v30.ch3.sourceforge.com> Revision: 26277 http://sourceforge.net/p/gar/code/26277 Author: dmichelsen Date: 2017-09-08 11:40:36 +0000 (Fri, 08 Sep 2017) Log Message: ----------- mod_auth_kerb/trunk: Add package for Apache 2.4 Modified Paths: -------------- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch Modified: csw/mgar/pkg/mod_auth_kerb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-05 11:50:21 UTC (rev 26276) +++ csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-08 11:40:36 UTC (rev 26277) @@ -17,33 +17,78 @@ # https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775 PATCHFILES += 0001-Fix-install-destination.patch +# Taken from https://sourceforge.net/p/modauthkerb/patches/32/ and recreated the patch to suite patchlevel +PATCHFILES-sapi-ap24 += 0001-Forward-port-to-Apache-2.4.patch +PATCHFILES += $(PATCHFILES-sapi-$(SAPI)) + VENDOR_URL = http://modauthkerb.sourceforge.net/ LICENSE = LICENSE -PACKAGES = CSWap2modauthkerb -CATALOGNAME = ap2_mod_auth_kerb -CHECKPKG_OVERRIDES_CSWap2modauthkerb += catalogname-does-not-match-pkgname|pkgname=CSWap2modauthkerb|catalogname=ap2_mod_auth_kerb|expected-catalogname=ap2modauthkerb -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWapache2 -CHECKPKG_OVERRIDES_CSWap2modauthkerb += surplus-dependency|CSWapache2 +BUILD64 = 1 +EXTRA_MODULATORS += SAPI +MODULATIONS_SAPI += ap2 +MODULATIONS_SAPI += ap24 +MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all +MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all +MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocated-only +MERGE_DIRS_isa-default64-sapi-ap24 = $(libdir) + + +# Apache 2.2 is only available in 32 bit +SKIP_MODULATIONS += isa-sparcv9-sapi-ap2 +SKIP_MODULATIONS += isa-amd64-sapi-ap2 +CHECKPKG_OVERRIDES_CSWap2-mod-auth-kerb += 64-bit-binaries-missing + +PACKAGES = CSWap2-mod-auth-kerb +SPKG_DESC_CSWap2-mod-auth-kerb = Apache Kerberos authentication module for Apache 2.2 +PKGFILES_CSWap2-mod-auth-kerb += $(prefix)/apache2/.* +PKGFILES_CSWap2-mod-auth-kerb += $(docdir)/ap2_mod_auth_kerb/.* +RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWapache2 +CHECKPKG_OVERRIDES_CSWap2-mod-auth-kerb += surplus-dependency|CSWapache2 +OBSOLETED_BY_CSWap2-mod-auth-kerb += CSWap2modauthkerb +CATALOGNAME_CSWap2modauthkerb = ap2_mod_auth_kerb_stub + +PACKAGES += CSWap24-mod-auth-kerb +SPKG_DESC_CSWap24-mod-auth-kerb = Apache Kerberos authentication module for Apache 2.4 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWapache24 +CHECKPKG_OVERRIDES_CSWap24-mod-auth-kerb += surplus-dependency|CSWapache24 + + # Apache paths -AP2_ROOT = $(prefix)/apache2 -AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec +AP2_MODULEDIR-sapi-ap2 = $(DESTDIR)$(prefix)/apache2/libexec +AP2_MODULEDIR-sapi-ap24 = $(DESTDIR)$(libdir)/apache2/modules +AP2_MODULEDIR = $(AP2_MODULEDIR-sapi-$(SAPI)) CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --without-krb4 CONFIGURE_ARGS += --with-krb5=$(prefix) -CONFIGURE_ARGS += --with-apache=$(prefix)/apache2 +# configure looks for apxs in $with_apache_dir/{bin,sbin}:$PATH, so do not use that directive but make sure +# we find the correct apxs in a directory early in the PATH. +# $(bindir) is modulated and contains memorymodel-specific subdirs if required +# CONFIGURE_ARGS += --with-apache=$(prefix)/apache2 +CONFIGURE_ENV_PATH-sapi-ap2 = $(prefix)/apache2/sbin:$(PATH) +CONFIGURE_ENV_PATH-sapi-ap24 = $(bindir):$(PATH) +CONFIGURE_ENV_PATH = $(CONFIGURE_ENV_PATH-sapi-$(SAPI)) + +# CONFIGURE_ARGS = $(DIRPATHS) +# CONFIGURE_ARGS-ap2 += --with-apxs=$(prefix)/apache2/sbin/apxs +# CONFIGURE_ARGS-ap24 += --with-apxs=$(prefix)/bin/apxs +# CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI)) + # The package does not provide a check TEST_SCRIPTS = INSTALL_OVERRIDE_VARS = AP2_LIBEXEC -INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_LIBEXEC) +INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_MODULEDIR) AP2_MODS = 1 AP2_MODFILES += \*auth_kerb\*so @@ -51,7 +96,9 @@ include gar/category.mk pre-install-modulated: - ginstall -d $(AP2_LIBEXEC) - ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) - ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL $(DESTDIR)$(docdir)/$(CATALOGNAME) + ginstall -d $(AP2_MODULEDIR) + ginstall -d $(DESTDIR)$(docdir)/ap2_mod_auth_kerb + ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL $(DESTDIR)$(docdir)/ap2_mod_auth_kerb + ginstall -d $(DESTDIR)$(docdir)/ap24_mod_auth_kerb + ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL $(DESTDIR)$(docdir)/ap24_mod_auth_kerb @$(MAKECOOKIE) Added: csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch (rev 0) +++ csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch 2017-09-08 11:40:36 UTC (rev 26277) @@ -0,0 +1,59 @@ +From 13ce2de81938ff3382dcb39cc6ae5b1e9eaeca27 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 8 Sep 2017 11:47:54 +0200 +Subject: [PATCH] Forward-port to Apache 2.4 + +--- + src/mod_auth_kerb.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c +index d204a3e..207bc9d 100644 +--- a/src/mod_auth_kerb.c ++++ b/src/mod_auth_kerb.c +@@ -62,6 +62,12 @@ + #include + #include + ++#ifdef APLOG_USE_MODULE ++APLOG_USE_MODULE(auth_kerb); ++#undef APLOG_MARK ++#define APLOG_MARK __FILE__, __LINE__ ++#endif ++ + #ifdef STANDARD20_MODULE_STUFF + #include + #include +@@ -360,7 +366,11 @@ log_rerror(const char *file, int line, int level, int status, + + + #ifdef STANDARD20_MODULE_STUFF ++#ifdef APLOG_USE_MODULE ++ ap_log_rerror(file, line, APLOG_MODULE_INDEX, level | APLOG_NOERRNO, status, r, "%s", errstr); ++#else + ap_log_rerror(file, line, level | APLOG_NOERRNO, status, r, "%s", errstr); ++#endif + #else + ap_log_rerror(file, line, level | APLOG_NOERRNO, r, "%s", errstr); + #endif +@@ -1555,7 +1565,7 @@ already_succeeded(request_rec *r, char *auth_line) + char keyname[1024]; + + snprintf(keyname, sizeof(keyname) - 1, +- "mod_auth_kerb::connection::%s::%ld", r->connection->remote_ip, ++ "mod_auth_kerb::connection::%s::%ld", r->useragent_ip, + r->connection->id); + + if (apr_pool_userdata_get((void**)&conn_data, keyname, r->connection->pool) != 0) +@@ -1709,7 +1719,7 @@ kerb_authenticate_user(request_rec *r) + prevauth->last_return = ret; + snprintf(keyname, sizeof(keyname) - 1, + "mod_auth_kerb::connection::%s::%ld", +- r->connection->remote_ip, r->connection->id); ++ r->useragent_ip, r->connection->id); + apr_pool_userdata_set(prevauth, keyname, NULL, r->connection->pool); + } + +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 8 14:03:05 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 Sep 2017 12:03:05 +0000 Subject: SF.net SVN: gar:[26278] csw/mgar/pkg/mod_auth_kerb/trunk Message-ID: <1504872185.510921.24357@sfp-scm-4.v30.ch3.sourceforge.com> Revision: 26278 http://sourceforge.net/p/gar/code/26278 Author: dmichelsen Date: 2017-09-08 12:03:05 +0000 (Fri, 08 Sep 2017) Log Message: ----------- mod_auth_kerb/trunk: Make sure to find the right krb5-config Modified Paths: -------------- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch Modified: csw/mgar/pkg/mod_auth_kerb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-08 11:40:36 UTC (rev 26277) +++ csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-08 12:03:05 UTC (rev 26278) @@ -17,6 +17,9 @@ # https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775 PATCHFILES += 0001-Fix-install-destination.patch +# MAke sure to use the correct krb5-config +PATCHFILES += 0001-Hardcode-path-to-krb5-config.patch + # Taken from https://sourceforge.net/p/modauthkerb/patches/32/ and recreated the patch to suite patchlevel PATCHFILES-sapi-ap24 += 0001-Forward-port-to-Apache-2.4.patch PATCHFILES += $(PATCHFILES-sapi-$(SAPI)) @@ -44,10 +47,11 @@ SPKG_DESC_CSWap2-mod-auth-kerb = Apache Kerberos authentication module for Apache 2.2 PKGFILES_CSWap2-mod-auth-kerb += $(prefix)/apache2/.* PKGFILES_CSWap2-mod-auth-kerb += $(docdir)/ap2_mod_auth_kerb/.* -RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWapache2 +RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += $(RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb-$(GARCH)) CHECKPKG_OVERRIDES_CSWap2-mod-auth-kerb += surplus-dependency|CSWapache2 OBSOLETED_BY_CSWap2-mod-auth-kerb += CSWap2modauthkerb CATALOGNAME_CSWap2modauthkerb = ap2_mod_auth_kerb_stub @@ -55,10 +59,11 @@ PACKAGES += CSWap24-mod-auth-kerb SPKG_DESC_CSWap24-mod-auth-kerb = Apache Kerberos authentication module for Apache 2.4 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWapache24 +RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += $(RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb-$(GARCH)) CHECKPKG_OVERRIDES_CSWap24-mod-auth-kerb += surplus-dependency|CSWapache24 @@ -69,7 +74,7 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --without-krb4 -CONFIGURE_ARGS += --with-krb5=$(prefix) +CONFIGURE_ARGS += --with-krb5=$(bindir)/krb5-config # configure looks for apxs in $with_apache_dir/{bin,sbin}:$PATH, so do not use that directive but make sure # we find the correct apxs in a directory early in the PATH. Added: csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch (rev 0) +++ csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch 2017-09-08 12:03:05 UTC (rev 26278) @@ -0,0 +1,27 @@ +From 1e57513143d279cb6cd5570187dcb5fed2f848a1 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 8 Sep 2017 13:56:55 +0200 +Subject: [PATCH] Hardcode path to krb5-config + +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index ffd2da3..f6e396b 100755 +--- a/configure ++++ b/configure +@@ -3809,8 +3809,8 @@ if test "x$with_krb5" != "xno" ; then + ac_save_LIBS="$LIBS" + + if test -n "$with_krb5"; then +- if test -x "$with_krb5/bin/krb5-config"; then +- krb5_config_command="$with_krb5/bin/krb5-config" ++ if test -x "$with_krb5"; then ++ krb5_config_command="$with_krb5" + else + krb5_config_command="" + fi +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 8 15:54:57 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 Sep 2017 13:54:57 +0000 Subject: SF.net SVN: gar:[26279] csw/mgar/pkg/subversion/trunk Message-ID: <1504878897.153391.2801@sfp-scm-1.v30.ch3.sourceforge.com> Revision: 26279 http://sourceforge.net/p/gar/code/26279 Author: dmichelsen Date: 2017-09-08 13:54:56 +0000 (Fri, 08 Sep 2017) Log Message: ----------- subversion/trunk: Update to 1.9.7 and make Apache 2.4 bindings only Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.postinstall csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.preremove Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2017-09-08 12:03:05 UTC (rev 26278) +++ csw/mgar/pkg/subversion/trunk/Makefile 2017-09-08 13:54:56 UTC (rev 26279) @@ -20,7 +20,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.9.5 +VERSION = 1.9.7 GARTYPE = v2 DESCRIPTION = Version control rethought @@ -29,10 +29,10 @@ that is a compelling replacement for CVS in the open source community. endef -MASTER_SITES = http://mirror.serversupportforum.de/apache/subversion/ +MASTER_SITES = ftp://ftp.fau.de/apache/subversion/ DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += CSWap2-subversion.preremove -DISTFILES += CSWap2-subversion.postinstall +DISTFILES += CSWap24-subversion.preremove +DISTFILES += CSWap24-subversion.postinstall DISTFILES += httpd-svn.conf.CSW DISTFILES += svn_access.conf.CSW @@ -335,24 +335,23 @@ RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)-$(GARCH)) -PACKAGES += CSWap2-subversion -SPKG_DESC_CSWap2-subversion = Subversion Modules for Apache 2.2 -PKGFILES_CSWap2-subversion += $(prefix)/apache2/.* -PKGFILES_CSWap2-subversion += $(docdir)/$(CATALOGNAME_CSWap2-subversion)/changelog.CSW -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWapache2 -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-repos1-0 -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-fs1-0 -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-delta1-0 -RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl9 -RUNTIME_DEP_PKGS_CSWap2-subversion += $(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GAROSREL)-$(GARCH)) +PACKAGES += CSWap24-subversion +SPKG_DESC_CSWap24-subversion = Subversion Modules for Apache 2.4 +PKGFILES_CSWap24-subversion += $(sysconfdir)/apache2/.* +PKGFILES_CSWap24-subversion += $(libdir)/apache2/.* +PKGFILES_CSWap24-subversion += $(docdir)/$(CATALOGNAME_CSWap24-subversion)/changelog.CSW +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWapache24 +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-repos1-0 +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-fs1-0 +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-delta1-0 +RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-subr1-0 +RUNTIME_DEP_PKGS_CSWap24-subversion-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWap24-subversion-5.10-sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWap24-subversion += $(RUNTIME_DEP_PKGS_CSWap24-subversion-$(GAROSREL)-$(GARCH)) +CHECKPKG_OVERRIDES_CSWap24-subversion += surplus-dependency|CSWapache24 -OBSOLETED_BY_CSWap2-subversion += CSWap2svn -CATALOGNAME_CSWap2svn = ap2_subversion_stub - PACKAGES-5.10 += CSWjavasvn PACKAGES += $(PACKAGES-$(GAROSREL)) SPKG_DESC_CSWjavasvn = Subversion Java Language Binding @@ -539,13 +538,16 @@ CONFIGURE_ARGS_5.10 += --enable-javahl CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config -CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += --with-apxs=$(bindir)/apxs CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) # XXX: configure: WARNING: unrecognized options: --with-ssl # CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec +# Apache 2.2 +#CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec +# Apache 2.4 +CONFIGURE_ARGS += --with-apache-libexecdir=$(libdir)/apache2/modules # No Keyring on Solaris 9 CONFIGURE_ARGS-5.10-32 += --with-gnome-keyring=$(prefix) @@ -663,7 +665,6 @@ /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py cd $(WORKSRC) && cp libtool.suncc libtool - @$(MAKECOOKIE) svn-perl: @echo " ==> Building Perl bindings" @@ -672,7 +673,6 @@ $(WORKSRC)/subversion/bindings/swig/perl/native/*.pm /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-pl /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl - @$(MAKECOOKIE) svn-ruby: @echo " ==> Building Ruby bindings" @@ -679,7 +679,6 @@ touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-rb /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-rb - @$(MAKECOOKIE) svn-java: EXTRA_LINKER_FLAGS += -norunpath svn-java: @@ -687,7 +686,6 @@ touch $(WORKSRC)/subversion/bindings/javahl/native/*.c /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) javahl; /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-javahl; - @$(MAKECOOKIE) #post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) @@ -699,23 +697,20 @@ ( cd $(WORKSRC)/doc/book ; \ ginstall svn-book.html $(DESTDIR)$(docdir) ; \ ginstall svn-book.pdf $(DESTDIR)$(docdir) ) - @$(MAKECOOKIE) copy-templates: - ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 \ + ginstall -d $(DESTDIR)$(sysconfdir)/apache2/extra + ginstall -D -m 0644 \ $(WORKDIR)/httpd-svn.conf.CSW \ - $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 \ + $(DESTDIR)$(sysconfdir)/apache2/extra + ginstall -D -m 0644 \ $(WORKDIR)/svn_access.conf.CSW \ - $(DESTDIR)$(prefix)/apache2/etc - @$(MAKECOOKIE) + $(DESTDIR)$(sysconfdir)/apache2 install-man: ginstall -m 0644 \ $(WORKSRC)/subversion/svnsync/svnsync.1 \ $(DESTDIR)$(mandir)/man1 - @$(MAKECOOKIE) post-merge: Deleted: csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall =================================================================== --- csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall 2017-09-08 12:03:05 UTC (rev 26278) +++ csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall 2017-09-08 13:54:56 UTC (rev 26279) @@ -1,55 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf -APXS=$AP2_BINDIR/apxs - -# Enable modules -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -for mod in dav dav_fs dav_svn dav_lock authz_svn -do - perl -i -lne "print unless /^#?LoadModule.*mod_$mod.so/" $AP2_CONFIG - chroot $PKG_INSTALL_ROOT \ - $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n $mod mod_$mod.so -done - -# Configure mod_dav_svn in httpd.conf -if [ -n "`egrep 'IfModule (mod_dav_svn|dav_svn_module)' $AP2_CONFIG`" ] -then - echo "Existing mod_dav_svn configuration detected" -elif [ -n "`egrep '#Include etc/extra/httpd-svn.conf' $AP2_CONFIG`" ]; then - echo "Re-enabling existing config" - perl -i -plne 's,^#(Include etc/extra/httpd-svn.conf),$1,' $AP2_CONFIG -else - echo "Adding Include for extra/http-svn.conf to httpd.conf" - cat << END >> $AP2_CONFIG - -Include etc/extra/httpd-svn.conf -END -fi - -# Copy templates -for file in $AP2_EXTRADIR/httpd-svn.conf $AP2_CONFDIR/svn_access.conf -do - if [ ! -f $file ]; then - echo "Creating $file" - cp $file.CSW $file - else - echo "Preserving existing $file" - fi -done - -# Finito -cat <> $AP2_CONFIG + +Include etc/extra/httpd-svn.conf +END +fi + +# Copy templates +for file in $AP2_EXTRADIR/httpd-svn.conf $AP2_CONFDIR/svn_access.conf +do + if [ ! -f $file ]; then + echo "Creating $file" + cp $file.CSW $file + else + echo "Preserving existing $file" + fi +done + +# Finito +cat < Revision: 26280 http://sourceforge.net/p/gar/code/26280 Author: dmichelsen Date: 2017-09-08 13:55:20 +0000 (Fri, 08 Sep 2017) Log Message: ----------- subversion/trunk: Update to 1.9.7 and make Apache 2.4 bindings only Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2017-09-08 13:54:56 UTC (rev 26279) +++ csw/mgar/pkg/subversion/trunk/checksums 2017-09-08 13:55:20 UTC (rev 26280) @@ -1 +1 @@ -9fcbae352a5efe73d46a88c97c6bba14 subversion-1.9.5.tar.bz2 +05b0c677681073920f938c1f322e0be2 subversion-1.9.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 12 15:54:26 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Sep 2017 13:54:26 +0000 Subject: SF.net SVN: gar:[26281] csw/mgar/pkg Message-ID: <1505224467.7628.6812@sfp-scm-2.v30.ch3.sourceforge.com> Revision: 26281 http://sourceforge.net/p/gar/code/26281 Author: dmichelsen Date: 2017-09-12 13:54:26 +0000 (Tue, 12 Sep 2017) Log Message: ----------- libffcall: Update to 2.0 Modified Paths: -------------- csw/mgar/pkg/libffcall/trunk/Makefile csw/mgar/pkg/libffcall/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libffcall/ Removed Paths: ------------- csw/mgar/pkg/ffcall/ Modified: csw/mgar/pkg/libffcall/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffcall/trunk/Makefile 2017-09-08 13:55:20 UTC (rev 26280) +++ csw/mgar/pkg/libffcall/trunk/Makefile 2017-09-12 13:54:26 UTC (rev 26281) @@ -1,6 +1,6 @@ # $Id$ -NAME = ffcall -VERSION = 1.10 +NAME = libffcall +VERSION = 2.0 GARTYPE = v2 DESCRIPTION = Foreign function call libraries @@ -8,8 +8,8 @@ This is a collection of four libraries which can be used to build foreign function call interfaces in embedded interpreters. endef -MASTER_SITES = http://www.haible.de/bruno/gnu/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES += $(GNU_MIRROR) +DISTFILES += $(DISTNAME).tar.gz # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -16,10 +16,40 @@ VENDOR_URL = http://www.haible.de/bruno/packages-ffcall.html +PACKAGES += CSWlibavcall1 +SPKG_DESC_CSWlibavcall1 = Foreign function call libraries, libavcall.so.1 +PKGFILES_CSWlibavcall1 += $(call pkgfiles_lib,libavcall.so.1) + +PACKAGES += CSWlibcallback1 +SPKG_DESC_CSWlibcallback1 = Foreign function call libraries, libcallbacko.1 +PKGFILES_CSWlibcallback1 = $(call pkgfiles_lib,libcallback.so.1) + +PACKAGES += CSWlibffcall0 +SPKG_DESC_CSWlibffcall0 = Foreign function call libraries, libffcall.so.0 +PKGFILES_CSWlibffcall0 += $(call pkgfiles_lib,libffcall.so.0) + +PACKAGES += CSWlibtrampoline1 +SPKG_DESC_CSWlibtrampoline1 = Foreign function call libraries, lintrampoline.so.1 +PKGFILES_CSWlibtrampoline1 += $(call pkgfiles_lib,libtrampoline.so.1) + +PACKAGES += CSWlibffcall-dev +SPKG_DESC_CSWlibffcall-dev = Development files for libffcall.so.0 and assorted libs +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibffcall-dev += CSWlibffcall0 +RUNTIME_DEP_PKGS_CSWlibffcall-dev += CSWlibavcall1 +RUNTIME_DEP_PKGS_CSWlibffcall-dev += CSWlibcallback1 +RUNTIME_DEP_PKGS_CSWlibffcall-dev += CSWlibtrampoline1 +OBSOLETED_BY_CSWlibffcall-dev += CSWffcall + +BUILD64 = 1 + +# We must make sure to pass -m64 in $CC or the detection of solaris64 won't work +CC_EXTRA-64 = -m64 +CC_EXTRA = $(CC_EXTRA-$(MEMORYMODEL)) + CONFIGURE_ARGS = $(DIRPATHS) +# We need 'grep -E' +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + include gar/category.mk - -pre-install-modulated: - ginstall -d $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(mandir) Modified: csw/mgar/pkg/libffcall/trunk/checksums =================================================================== --- csw/mgar/pkg/ffcall/trunk/checksums 2017-09-08 13:55:20 UTC (rev 26280) +++ csw/mgar/pkg/libffcall/trunk/checksums 2017-09-12 13:54:26 UTC (rev 26281) @@ -1 +1 @@ -2db95007e901f3bc2ae7e5a9fe9ebea4 ffcall-1.10.tar.gz +e2e67382752287c5a7c42ac7ae79bfdc libffcall-2.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 Wed Sep 13 11:55:08 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Sep 2017 09:55:08 +0000 Subject: SF.net SVN: gar:[26282] csw/mgar/pkg/tcpdump/trunk Message-ID: <1505296508.871522.14042@sfp-scm-1.v30.ch3.sourceforge.com> Revision: 26282 http://sourceforge.net/p/gar/code/26282 Author: dmichelsen Date: 2017-09-13 09:55:08 +0000 (Wed, 13 Sep 2017) Log Message: ----------- tcpdump/trunk: Update to 4.9.2 Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2017-09-12 13:54:26 UTC (rev 26281) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2017-09-13 09:55:08 UTC (rev 26282) @@ -1,5 +1,5 @@ NAME = tcpdump -VERSION = 4.9.0 +VERSION = 4.9.2 GARTYPE = v2 DESCRIPTION = Dump network traffic @@ -31,8 +31,4 @@ # There is a versioned tcpdump, which is not a hardlink. No need for that. EXTRA_MERGE_EXCLUDE_FILES = $(sbindir)/tcpdump\..* -# There is a failing test: -# https://github.com/the-tcpdump-group/tcpdump/issues/351 -# SKIPTEST ?= 1 - include gar/category.mk Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2017-09-12 13:54:26 UTC (rev 26281) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2017-09-13 09:55:08 UTC (rev 26282) @@ -1 +1 @@ -2b83364eef53b63ca3181b4eb56dab0c tcpdump-4.9.0.tar.gz +9bbc1ee33dab61302411b02dd0515576 tcpdump-4.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 25 08:47:07 2017 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Sep 2017 06:47:07 +0000 Subject: SF.net SVN: gar:[26283] csw/mgar/pkg/mutt/trunk Message-ID: <1506322027.645958.15438@sfp-scm-8.v30.ch3.sourceforge.com> Revision: 26283 http://sourceforge.net/p/gar/code/26283 Author: dmichelsen Date: 2017-09-25 06:47:07 +0000 (Mon, 25 Sep 2017) Log Message: ----------- mutt/trunk: Update to 1.9.1 Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2017-09-13 09:55:08 UTC (rev 26282) +++ csw/mgar/pkg/mutt/trunk/Makefile 2017-09-25 06:47:07 UTC (rev 26283) @@ -1,5 +1,5 @@ NAME = mutt -VERSION = 1.8.3 +VERSION = 1.9.1 GARTYPE = v2 EXTRA_MODULATORS = SLANG Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2017-09-13 09:55:08 UTC (rev 26282) +++ csw/mgar/pkg/mutt/trunk/checksums 2017-09-25 06:47:07 UTC (rev 26283) @@ -1 +1 @@ -8d1ff7275a3b4fbb0023145abe309cc8 mutt-1.8.3.tar.gz +1fbf126b8588e11263bd655b192173bd mutt-1.9.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From sfbsdsx at users.sourceforge.net Sat Sep 30 09:05:00 2017 From: sfbsdsx at users.sourceforge.net (sfbsdsx at users.sourceforge.net) Date: Sat, 30 Sep 2017 07:05:00 +0000 Subject: SF.net SVN: gar:[26284] csw/mgar/pkg/fossil/trunk/Makefile Message-ID: <1506755100.680959.10173@sfp-scm-5.v30.ch3.sourceforge.com> Revision: 26284 http://sourceforge.net/p/gar/code/26284 Author: sfbsdsx Date: 2017-09-30 07:05:00 +0000 (Sat, 30 Sep 2017) Log Message: ----------- fossil/trunk: useless definition Modified Paths: -------------- csw/mgar/pkg/fossil/trunk/Makefile Modified: csw/mgar/pkg/fossil/trunk/Makefile =================================================================== --- csw/mgar/pkg/fossil/trunk/Makefile 2017-09-25 06:47:07 UTC (rev 26283) +++ csw/mgar/pkg/fossil/trunk/Makefile 2017-09-30 07:05:00 UTC (rev 26284) @@ -23,8 +23,6 @@ BUILD64 = 1 -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) - NODIRPATHS += --exec_prefix GARCOMPILER = GCC5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.