[csw-devel] SF.net SVN: gar:[14456] csw/mgar/gar/v2/gar.mk
Revision: 14456 http://gar.svn.sourceforge.net/gar/?rev=14456&view=rev Author: dmichelsen Date: 2011-04-29 09:41:42 + (Fri, 29 Apr 2011) Log Message: --- mGAR v2: Bugfix after pcopy transition for copy-config-only Modified Paths: -- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk === --- csw/mgar/gar/v2/gar.mk 2011-04-29 02:51:34 UTC (rev 14455) +++ csw/mgar/gar/v2/gar.mk 2011-04-29 09:41:42 UTC (rev 14456) @@ -887,8 +887,7 @@ # Copy merge-copy-config-only: $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ - -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ - -s ",.*,," \ + -m -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ . $(PKGROOT) \ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14457] csw/mgar/pkg/libcurl4/trunk
Revision: 14457 http://gar.svn.sourceforge.net/gar/?rev=14457&view=rev Author: dmichelsen Date: 2011-04-29 10:01:30 + (Fri, 29 Apr 2011) Log Message: --- libcurl4: Dynamically generate curlbuild.h Modified Paths: -- csw/mgar/pkg/libcurl4/trunk/Makefile Removed Paths: - csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h Modified: csw/mgar/pkg/libcurl4/trunk/Makefile === --- csw/mgar/pkg/libcurl4/trunk/Makefile2011-04-29 09:41:42 UTC (rev 14456) +++ csw/mgar/pkg/libcurl4/trunk/Makefile2011-04-29 10:01:30 UTC (rev 14457) @@ -15,7 +15,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += curlbuild.h # Use patch until this is fixed: # https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976 @@ -103,20 +102,12 @@ BUILD64 = 1 +# There are some failing tests, ignore for now +SKIPTEST ?= 1 -SKIPTEST = 1 +# We do special 32/64 merging for this one, see post-merge +EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h -# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full - -# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h -# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw -EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" -EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" -EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) - -# EXTRA_PAX_ARGS_32 += -s ",.*/libcurl\.so(\.\d+)?$$,$(libdir)/libcurl-$(FEATURES).so.4.2.0,p" -# EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" - EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p" EXTRA_PAX_ARGS_isa-i386-features-full+= -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p" EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p" @@ -150,5 +141,10 @@ ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4 rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 - ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h + pwd + gdiff -D 64bit \ + $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)-features-minimal$(includedir)/curl/curlbuild.h \ + $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT)-features-minimal$(includedir)/curl/curlbuild.h \ + | sed -e 's/ifndef 64bit/if defined __amd64 || defined __x86_64 || defined __sparcv9/' \ + > $(PKGROOT)$(includedir)/curl/curlbuild.h @$(MAKECOOKIE) Deleted: csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h === --- csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h 2011-04-29 09:41:42 UTC (rev 14456) +++ csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h 2011-04-29 10:01:30 UTC (rev 14457) @@ -1,6 +0,0 @@ -/* Allow 32 and 64 bit headers to coexist */ -#if defined __amd64 || defined __x86_64 || defined __sparcv9 -#include "curlbuild-64.h" -#else -#include "curlbuild-32.h" -#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14458] csw/mgar/pkg/libcurl4/trunk/Makefile
Revision: 14458 http://gar.svn.sourceforge.net/gar/?rev=14458&view=rev Author: dmichelsen Date: 2011-04-29 12:34:38 + (Fri, 29 Apr 2011) Log Message: --- libcurl4: Add missing dependencies, disable static libs Modified Paths: -- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile === --- csw/mgar/pkg/libcurl4/trunk/Makefile2011-04-29 10:01:30 UTC (rev 14457) +++ csw/mgar/pkg/libcurl4/trunk/Makefile2011-04-29 12:34:38 UTC (rev 14458) @@ -72,6 +72,12 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt +# Double-legacy packages may not even depend on CSWcurlrt, so we must +# also directly depend on CSWlibcurl2 and CSWlibcurl3 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl2 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl3 +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl2 +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl3 BUILD_DEP_PKGS += CSWoldapdevel BUILD_DEP_PKGS += CSWossldevel @@ -96,6 +102,7 @@ EXTRA_LDFLAGS = -L$(libdir)/libnet-new CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) @@ -126,6 +133,9 @@ MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only MERGE_DIRS_isa-default64-features-full = $(libdir) +# TBD: Use alternatives on curl-config between minimal and feature as it is possible to +# use options to find out about installed features and protocols by calling it. + include gar/category.mk post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14459] csw/mgar/pkg/libffi/trunk/Makefile
Revision: 14459 http://gar.svn.sourceforge.net/gar/?rev=14459&view=rev Author: wahwah Date: 2011-04-29 13:12:22 + (Fri, 29 Apr 2011) Log Message: --- pkg/libffi/trunk: Use OBSOLETED_BY_ syntax for -dev rename Modified Paths: -- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile === --- csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 12:34:38 UTC (rev 14458) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:12:22 UTC (rev 14459) @@ -47,9 +47,7 @@ PKGFILES_CSWlibffi-dev += $(datadir)/.* # An empty stub to let checkpkg know about the rename -PACKAGES += CSWlibffidevel -SPKG_DESC_CSWlibffidevel = A stub package, do not release -PKGFILES_CSWlibffidevel = NOFILES +OBSOLETED_BY_CSWlibffi-dev = CSWlibffidevel PACKAGES += CSWlibffi5 SPKG_DESC_CSWlibffi5 = $(DESCRIPTION) - libffi.so.5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14460] csw/mgar/pkg/libcurl4/trunk/Makefile
Revision: 14460 http://gar.svn.sourceforge.net/gar/?rev=14460&view=rev Author: dmichelsen Date: 2011-04-29 13:15:29 + (Fri, 29 Apr 2011) Log Message: --- libcurl4: Strip -m32 / -m64 from LDFLAGS as it disturbs 'curl-config --libs' as reported in #4550 Modified Paths: -- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile === --- csw/mgar/pkg/libcurl4/trunk/Makefile2011-04-29 13:12:22 UTC (rev 14459) +++ csw/mgar/pkg/libcurl4/trunk/Makefile2011-04-29 13:15:29 UTC (rev 14460) @@ -138,6 +138,9 @@ include gar/category.mk +# These are not really necessary and they confuse the linker as described in #4550 +$(GARCOMPILER)_LD_FLAGS := + post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: rm -f $(WORKSRC)/lib/libcurl.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14461] csw/mgar/pkg/libffi/trunk/Makefile
Revision: 14461 http://gar.svn.sourceforge.net/gar/?rev=14461&view=rev Author: wahwah Date: 2011-04-29 13:17:26 + (Fri, 29 Apr 2011) Log Message: --- pkg/libffi/trunk: Removing the now unnecessary stub. Modified Paths: -- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile === --- csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:15:29 UTC (rev 14460) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:17:26 UTC (rev 14461) @@ -46,9 +46,6 @@ PKGFILES_CSWlibffi-dev += $(libdir)/.*/include/.* PKGFILES_CSWlibffi-dev += $(datadir)/.* -# An empty stub to let checkpkg know about the rename -OBSOLETED_BY_CSWlibffi-dev = CSWlibffidevel - PACKAGES += CSWlibffi5 SPKG_DESC_CSWlibffi5 = $(DESCRIPTION) - libffi.so.5 PKGFILES_CSWlibffi5 += .*/libffi\.so\.5.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14462] csw/mgar/pkg/libffi/trunk/Makefile
Revision: 14462 http://gar.svn.sourceforge.net/gar/?rev=14462&view=rev Author: wahwah Date: 2011-04-29 14:28:35 + (Fri, 29 Apr 2011) Log Message: --- using the obsoletes mechanism for libffi Modified Paths: -- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile === --- csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:17:26 UTC (rev 14461) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 14:28:35 UTC (rev 14462) @@ -29,13 +29,8 @@ PATCHFILES += ffi64.c.patch PATCHFILES += 0005-libffi.pc-should-point-at-opt-csw-include.patch -PACKAGES += CSWlibffi -CATALOGNAME_CSWlibffi = libffi -SPKG_DESC_CSWlibffi = Empty transitional package -ARCHALL_CSWlibffi = 1 -# Backward compatibility ensured via a dependency -RUNTIME_DEP_PKGS_CSWlibffi += CSWlibffi5 -CHECKPKG_OVERRIDES_CSWlibffi += surplus-dependency|CSWlibffi5 +OBSOLETED_BY_CSWlibffi5 = CSWlibffi +OBSOLETED_BY_CSWlibffi5-dev = CSWlibffi PACKAGES += CSWlibffi-dev CATALOGNAME_CSWlibffi-dev = libffi_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14463] csw/mgar/gar/v2/gar.pkg.mk
Revision: 14463 http://gar.svn.sourceforge.net/gar/?rev=14463&view=rev Author: bdwalton Date: 2011-04-29 14:28:48 + (Fri, 29 Apr 2011) Log Message: --- gar/v2: change the priority of cswusergroup and ugfiles so we can deliver preserveconf, etc classed files with non-standard user/group settings Modified Paths: -- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk === --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:28:35 UTC (rev 14462) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:28:48 UTC (rev 14463) @@ -259,9 +259,15 @@ # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. -_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates +# NOTE: cswusergroup and ugfiles were moved to have higher priority +# than the conf handling classes. this allows one to manually set the +# user/group on conf files with prototype modifiers while still +# leveraging the conf handler classes. this is a priority issue as +# per the above note. + +_CSWCLASSES = cswusergroup ugfiles +_CSWCLASSES += cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates _CSWCLASSES += cswetcservices -_CSWCLASSES += cswusergroup ugfiles _CSWCLASSES += cswcrontab _CSWCLASSES += cswpycompile _CSWCLASSES += cswinetd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14464] csw/mgar/gar/v2/gar.pkg.mk
Revision: 14464 http://gar.svn.sourceforge.net/gar/?rev=14464&view=rev Author: bdwalton Date: 2011-04-29 14:31:01 + (Fri, 29 Apr 2011) Log Message: --- gar/v2: update note on class ordering change to provide concrete example of where this is necessary Modified Paths: -- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk === --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:28:48 UTC (rev 14463) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:31:01 UTC (rev 14464) @@ -263,7 +263,8 @@ # than the conf handling classes. this allows one to manually set the # user/group on conf files with prototype modifiers while still # leveraging the conf handler classes. this is a priority issue as -# per the above note. +# per the above note. (See bacula for an example of where this is +# required.) _CSWCLASSES = cswusergroup ugfiles _CSWCLASSES += cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14465] csw/mgar/pkg/bacula/trunk/Makefile
Revision: 14465 http://gar.svn.sourceforge.net/gar/?rev=14465&view=rev Author: bdwalton Date: 2011-04-29 14:34:38 + (Fri, 29 Apr 2011) Log Message: --- bacula/trunk: update prototype modifiers to ensure we still use preserveconf with bacula group setting Modified Paths: -- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile === --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:31:01 UTC (rev 14464) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:34:38 UTC (rev 14465) @@ -255,8 +255,9 @@ PROTOTYPE_GROUP_usergroupfiles = bacula PROTOTYPE_PERMS_usergroupfiles = 0770 PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.* -PROTOTYPE_CLASS_confgroup = ugfiles +PROTOTYPE_CLASS_confgroup = cswpreserveconf PROTOTYPE_GROUP_confgroup = bacula +PROTOTYPE_PERMS_confgroup = 0640 PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /opt/csw/libexec/bacula/.* PROTOTYPE_PERMS_generalperms = 0755 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14466] csw/mgar/pkg/bacula/trunk/Makefile
Revision: 14466 http://gar.svn.sourceforge.net/gar/?rev=14466&view=rev Author: bdwalton Date: 2011-04-29 14:59:22 + (Fri, 29 Apr 2011) Log Message: --- bacula/trunk: the file director needs a user/group file too as it has configs owned by group bacula too Modified Paths: -- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile === --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:34:38 UTC (rev 14465) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:59:22 UTC (rev 14466) @@ -128,6 +128,7 @@ PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf.CSW PKGFILES_CSWbacula-fd += /var/opt/csw/run PKGFILES_CSWbacula-fd += .*bacula_fd/.*postmsg +PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -242,6 +243,7 @@ USERGROUP += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup USERGROUP += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup +USERGROUP += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup POSTMSG = /opt/csw/share/doc/bacula_director/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_console/README.postmsg @@ -301,7 +303,7 @@ post-merge: @echo Adding user/group creation info... @(cd $(PKGROOT)/etc/opt/csw; \ - for p in director sd; do \ + for p in director sd fd; do \ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ done) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14467] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py
Revision: 14467
http://gar.svn.sourceforge.net/gar/?rev=14467&view=rev
Author: wahwah
Date: 2011-04-29 15:04:22 + (Fri, 29 Apr 2011)
Log Message:
---
submitpkg: Allow to specify an alternate directory
A new flag allows to specify a directory from which packages should be read.
Modified Paths:
--
csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py
Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py
===
--- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-29 14:59:22 UTC
(rev 14466)
+++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-29 15:04:22 UTC
(rev 14467)
@@ -124,10 +124,13 @@
dest="catalognames",
help="A comma-separated list of catalog names: "
"cups,cupsdevel,libcups")
-parser.add_option("-d", "--debug",
+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",
@@ -164,8 +167,11 @@
print CONFIG_INFO
print e
sys.exit(1)
- staging_dir = opencsw.StagingDir(config.get(CONFIG_RELEASE_SECTION,
- "package dir"))
+
+ package_dir = config.get(CONFIG_RELEASE_SECTION, "package dir")
+ if options.package_dir:
+package_dir = options.package_dir
+ staging_dir = opencsw.StagingDir(package_dir)
if options.catalognames:
catalognames = options.catalognames.split(",")
else:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14468] csw/mgar/pkg/bacula/trunk/Makefile
Revision: 14468 http://gar.svn.sourceforge.net/gar/?rev=14468&view=rev Author: bdwalton Date: 2011-04-29 15:04:45 + (Fri, 29 Apr 2011) Log Message: --- bacula/trunk: add /etc/services handling for each of the daemons Modified Paths: -- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile === --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:04:22 UTC (rev 14467) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:04:45 UTC (rev 14468) @@ -129,6 +129,7 @@ PKGFILES_CSWbacula-fd += /var/opt/csw/run PKGFILES_CSWbacula-fd += .*bacula_fd/.*postmsg PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup +PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/services CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -154,6 +155,7 @@ PKGFILES_CSWbacula-sd += $(localstatedir)/$(NAME)/archive PKGFILES_CSWbacula-sd += .*bacula_sd/.*postmsg PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup +PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/services CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -183,6 +185,7 @@ PKGFILES_CSWbacula-director += .*share/doc/bacula_director/README.CSW PKGFILES_CSWbacula-director += .*bacula_director/.*postmsg PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup +PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/services # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) @@ -250,6 +253,10 @@ POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg +ETCSERVICES = /etc/opt/csw/pkg/CSWbacula-dir/services +ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-fd/services +ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-sd/services + PROTOTYPE_MODIFIERS = usergroupfiles confgroup generalperms PROTOTYPE_FILES_usergroupfiles = /var/opt/csw/bacula.* PROTOTYPE_CLASS_usergroupfiles = ugfiles @@ -306,5 +313,8 @@ for p in director sd fd; do \ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ + echo "bacula-dir 9101/tcp" > pkg/CSWbacula-dir/services; \ + echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ + echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services; \ done) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14469] csw/mgar/pkg/bacula/trunk/Makefile
Revision: 14469 http://gar.svn.sourceforge.net/gar/?rev=14469&view=rev Author: bdwalton Date: 2011-04-29 15:07:10 + (Fri, 29 Apr 2011) Log Message: --- bacula/trunk: correct the shell code that inserts the services definitions Modified Paths: -- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile === --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:04:45 UTC (rev 14468) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:07:10 UTC (rev 14469) @@ -313,8 +313,7 @@ for p in director sd fd; do \ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ + done; \ echo "bacula-dir 9101/tcp" > pkg/CSWbacula-dir/services; \ echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ - echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services; \ - done) - + echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14470] csw/mgar/pkg/bacula/trunk/Makefile
Revision: 14470 http://gar.svn.sourceforge.net/gar/?rev=14470&view=rev Author: bdwalton Date: 2011-04-29 15:15:05 + (Fri, 29 Apr 2011) Log Message: --- bacula/trunk: bacula-director, not bacula-dir... Modified Paths: -- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile === --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:07:10 UTC (rev 14469) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:15:05 UTC (rev 14470) @@ -314,6 +314,6 @@ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ done; \ - echo "bacula-dir 9101/tcp" > pkg/CSWbacula-dir/services; \ + echo "bacula-dir 9101/tcp" > pkg/CSWbacula-director/services; \ echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14471] csw/mgar/pkg/bacula/trunk/Makefile
Revision: 14471 http://gar.svn.sourceforge.net/gar/?rev=14471&view=rev Author: bdwalton Date: 2011-04-29 15:25:33 + (Fri, 29 Apr 2011) Log Message: --- bacula/trunk: set proper value for directors ETCSERVICES Modified Paths: -- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile === --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:15:05 UTC (rev 14470) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:25:33 UTC (rev 14471) @@ -253,7 +253,7 @@ POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg -ETCSERVICES = /etc/opt/csw/pkg/CSWbacula-dir/services +ETCSERVICES = /etc/opt/csw/pkg/CSWbacula-director/services ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-fd/services ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-sd/services This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14472] csw/mgar/pkg/bacula/trunk
Revision: 14472
http://gar.svn.sourceforge.net/gar/?rev=14472&view=rev
Author: bdwalton
Date: 2011-04-29 16:43:12 + (Fri, 29 Apr 2011)
Log Message:
---
bacula/trunk: patch the init scripts so that user/group settings are taken into
account
Modified Paths:
--
csw/mgar/pkg/bacula/trunk/Makefile
Added Paths:
---
csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch
Modified: csw/mgar/pkg/bacula/trunk/Makefile
===
--- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:25:33 UTC (rev 14471)
+++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 16:43:12 UTC (rev 14472)
@@ -21,6 +21,7 @@
DISTFILES += postmsg
PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch
+PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch
BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel
BUILD_DEP_PKGS += CSWreadline CSWggettext-dev
Added:
csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch
===
---
csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch
(rev 0)
+++
csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch
2011-04-29 16:43:12 UTC (rev 14472)
@@ -0,0 +1,101 @@
+From eb01ec6ad7a7ff754cf03302d522f379b1392610 Mon Sep 17 00:00:00 2001
+From: Ben Walton
+Date: Fri, 29 Apr 2011 11:53:45 -0400
+Subject: [PATCH] Make the solaris init scripts user/group aware
+
+Import the values for the user and group settings specified by
+configure when generating the solaris init scripts. Use these values
+for the -u and -g parameters when starting the daemons.
+
+Signed-off-by: Ben Walton
+---
+ platforms/solaris/bacula-dir.in | 13 -
+ platforms/solaris/bacula-fd.in | 13 -
+ platforms/solaris/bacula-sd.in | 13 -
+ 3 files changed, 36 insertions(+), 3 deletions(-)
+
+diff --git a/platforms/solaris/bacula-dir.in b/platforms/solaris/bacula-dir.in
+index f34e672..c5a3a93 100755
+--- a/platforms/solaris/bacula-dir.in
b/platforms/solaris/bacula-dir.in
+@@ -9,11 +9,22 @@
+ # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+
++DIR_USER=@dir_user@
++DIR_GROUP=@dir_group@
++DIR_OPTIONS=''
++
+ RETVAL=0
+ case "$1" in
+ start)
++ if [ "${DIR_USER}" != '' ]; then
++ DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}"
++ fi
++ if [ "${DIR_GROUP}" != '' ]; then
++ DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
++ fi
++
+echo "Starting the Bacula Director: "
+- @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
++ @sbindir@/bacula-dir $2 ${DIR_OPTIONS} -c @sysconfdir@/bacula-dir.conf
+;;
+ stop)
+echo "Stopping the Director daemon: "
+diff --git a/platforms/solaris/bacula-fd.in b/platforms/solaris/bacula-fd.in
+index cd3bef1..eeca38d 100755
+--- a/platforms/solaris/bacula-fd.in
b/platforms/solaris/bacula-fd.in
+@@ -9,10 +9,21 @@
+ # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+
++FD_USER=@fd_user@
++FD_GROUP=@fd_group@
++FD_OPTIONS=''
++
+ case "$1" in
+ start)
++ if [ "${FD_USER}" != '' ]; then
++ FD_OPTIONS="${FD_OPTIONS} -u ${FD_USER}"
++ fi
++ if [ "${FD_GROUP}" != '' ]; then
++ FD_OPTIONS="${FD_OPTIONS} -g ${FD_GROUP}"
++ fi
++
+echo "Starting the Bacula File daemon: "
+- @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
++ @sbindir@/bacula-fd $2 ${FD_OPTIONS} -c @sysconfdir@/bacula-fd.conf
+;;
+ stop)
+echo "Stopping the Bacula File daemon: "
+diff --git a/platforms/solaris/bacula-sd.in b/platforms/solaris/bacula-sd.in
+index 6a0adb8..c547697 100755
+--- a/platforms/solaris/bacula-sd.in
b/platforms/solaris/bacula-sd.in
+@@ -9,10 +9,21 @@
+ # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+
++SD_USER=@sd_user@
++SD_GROUP=@sd_group@
++SD_OPTIONS=''
++
+ case "$1" in
+ start)
++ if [ "${SD_USER}" != '' ]; then
++ SD_OPTIONS="${SD_OPTIONS} -u ${SD_USER}"
++ fi
++ if [ "${SD_GROUP}" != '' ]; then
++ SD_OPTIONS="${SD_OPTIONS} -g ${SD_GROUP}"
++ fi
++
+echo "Starting the Bacula Storage daemon: "
+- @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
++ @sbindir@/bacula-sd $2 ${SD_OPTIONS} -c @sysconfdir@/bacula-sd.conf
+;;
+ stop)
+echo "Stopping the Bacula Storage daemon: "
+--
+1.7.1
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/
[csw-devel] SF.net SVN: gar:[14473] csw/mgar/pkg/sharutils/trunk
Revision: 14473 http://gar.svn.sourceforge.net/gar/?rev=14473&view=rev Author: wahwah Date: 2011-04-29 18:52:18 + (Fri, 29 Apr 2011) Log Message: --- pkg/sharutils/trunk: Version bump to 4.11.1, tests are failing. Modified Paths: -- csw/mgar/pkg/sharutils/trunk/Makefile csw/mgar/pkg/sharutils/trunk/checksums Modified: csw/mgar/pkg/sharutils/trunk/Makefile === --- csw/mgar/pkg/sharutils/trunk/Makefile 2011-04-29 16:43:12 UTC (rev 14472) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2011-04-29 18:52:18 UTC (rev 14473) @@ -7,7 +7,7 @@ # at r10011. NAME = sharutils -VERSION = 4.10 +VERSION = 4.11.1 CATEGORIES = utils DESCRIPTION = Makes so-called shell archives out of many files define BLURB @@ -37,6 +37,8 @@ # We won't be releasing CSWuuencode from this package. CHECKPKG_OVERRIDES_CSWuuencode += file-collision +SKIPTEST ?= 1 + include gar/category.mk post-merge: Modified: csw/mgar/pkg/sharutils/trunk/checksums === --- csw/mgar/pkg/sharutils/trunk/checksums 2011-04-29 16:43:12 UTC (rev 14472) +++ csw/mgar/pkg/sharutils/trunk/checksums 2011-04-29 18:52:18 UTC (rev 14473) @@ -1 +1 @@ -c8bbfa89810ce9f5399b38392549207c sharutils-4.10.tar.gz +733706803a19cf2dc91ee6ba9397d206 sharutils-4.11.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14474] csw/mgar/pkg/php5/trunk/Makefile
Revision: 14474 http://gar.svn.sourceforge.net/gar/?rev=14474&view=rev Author: bdwalton Date: 2011-04-29 23:53:22 + (Fri, 29 Apr 2011) Log Message: --- php5/trunk: httpd-php5.conf must be installed into DESTDIR Modified Paths: -- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile === --- csw/mgar/pkg/php5/trunk/Makefile2011-04-29 18:52:18 UTC (rev 14473) +++ csw/mgar/pkg/php5/trunk/Makefile2011-04-29 23:53:22 UTC (rev 14474) @@ -332,7 +332,7 @@ post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @mkdir -p $(DESTDIR)$(AP2EXTCONF) - @cp $(WORKDIR)/httpd-php5.conf $(AP2EXTCONF) + @cp $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14475] csw/mgar/pkg/php5/trunk
Revision: 14475
http://gar.svn.sourceforge.net/gar/?rev=14475&view=rev
Author: bdwalton
Date: 2011-04-30 01:05:35 + (Sat, 30 Apr 2011)
Log Message:
---
php5/trunk: add preremove and postinstall scripts for modphp5 to manage
httpd-php5.conf
Modified Paths:
--
csw/mgar/pkg/php5/trunk/Makefile
Added Paths:
---
csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall
csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.preremove
Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2011-04-29 23:53:22 UTC (rev 14474)
+++ csw/mgar/pkg/php5/trunk/Makefile2011-04-30 01:05:35 UTC (rev 14475)
@@ -41,6 +41,8 @@
DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
DISTFILES += CSWphp5.cswreleasenotes
DISTFILES += CSWap2-modphp5.cswreleasenotes
+DISTFILES += CSWap2-modphp5.postinstall
+DISTFILES += CSWap2-modphp5.preremove
DISTFILES += httpd-php5.conf
PATCHFILES += 0001-Strip-usr-ucblib-references.patch
Added: csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall
===
--- csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall
(rev 0)
+++ csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall2011-04-30
01:05:35 UTC (rev 14475)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf
+
+# Configure mod_php5 in httpd.conf
+if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ]
+then
+echo "Existing mod_php5 configuration detected"
+elif [ -n "`egrep '#Include etc/extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
+echo "Re-enabling existing config"
+perl -i -plne 's,^#(Include etc/extra/httpd-php5.conf),$1,' $AP2_CONFIG
+else
+echo "Adding Include for extra/http-php5.conf to httpd.conf"
+cat << END >> $AP2_CONFIG
+
+Include etc/extra/httpd-php5.conf
+END
+fi
+
+# Finito
+cat
[csw-devel] proposed modification of i.cswusergroup
Hi All,
The following patch to i.cswusergroup allows for a 9th field which is
a comma separated list of auxiliary groups (passed as -G to useradd)
in the cswusergroup file. The validation of the field is done by
useradd although we could run it through a loop on getent group $g...
I've tested it (lightly) and it seems to work. Does anyone else want
to give it a whirl and provide feedback before I commit it?
Thanks
-Ben
Index: files/CSWcswclassutils.i.cswusergroup
===
--- files/CSWcswclassutils.i.cswusergroup (revision 14394)
+++ files/CSWcswclassutils.i.cswusergroup (working copy)
@@ -5,8 +5,10 @@
# $Id$
#
# Written by Peter Bonivart
+# Modified by Ben Walton
#
# 2009-02-10 First release
+# 2011-04-29 Add support for auxgroups
#
# Documentation: http://wiki.opencsw.org/cswclassutils-package
#
@@ -171,6 +173,7 @@
shell="$5"
create="$6"
nopass="$7"
+ auxgroups="$8"
if getent passwd $user > /dev/null; then
echo User $user already exists
@@ -186,10 +189,11 @@
[ -n "$dir" ] && dir="-d $dir"
[ -n "$shell" ] && shell="-s $shell"
[ -n "$create" ] && create="-m"
+ [ -n "$auxgroups" ] && auxgroups="-G $auxgroups"
- debug_echo "/usr/sbin/useradd -g $uid $gcos $group $create $dir $shell $user"
+ debug_echo "/usr/sbin/useradd -g $uid $gcos $group $auxgroups $create $dir
$shell $user"
if /usr/sbin/useradd \
- -u $uid $gcos $group $create $dir $shell $user > /dev/null
+ -u $uid $gcos $group $auxgroups $create $dir $shell $user > /dev/null
then
echo User $user has been added
else
@@ -253,6 +257,7 @@
shell=`echo $i | awk -F':' '{print $5}'`
create=`echo $i | awk -F':' '{print $6}'`
nopass=`echo $i | awk -F':' '{print $8}'`
+auxgroups=`echo $i | awk -F':' '{print $9}'`
if [ -n "$group" ]; then
create_group $group
@@ -262,7 +267,7 @@
if [ -n "$user" ]; then
create_user \
-"$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass"
+"$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass"
"$auxgroups"
else
echo No user to create
fi
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[14476] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswcptemplates
Revision: 14476
http://gar.svn.sourceforge.net/gar/?rev=14476&view=rev
Author: bdwalton
Date: 2011-04-30 02:16:23 + (Sat, 30 Apr 2011)
Log Message:
---
cswclassutils/trunk: use proper file name to determine owner, group and mode
when installing default template config files; mantis id 4762
Modified Paths:
--
csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
Modified:
csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
===
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
2011-04-30 01:05:35 UTC (rev 14475)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
2011-04-30 02:16:23 UTC (rev 14476)
@@ -122,7 +122,7 @@
else
file=$template
fi
- contents=`grep "^${file} "
$PKG_INSTALL_ROOT/var/sadm/install/contents`
+ contents=`grep "^${TEMPLATEDIR}/${PKG}/${file} "
$PKG_INSTALL_ROOT/var/sadm/install/contents`
if [ "$contents" ]; then
mode=`echo $contents | awk '{print $4}'`
user=`echo $contents | awk '{print $5}'`
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
