Revision: 25792
http://sourceforge.net/p/gar/code/25792
Author: dmichelsen
Date: 2016-06-29 12:01:05 +0000 (Wed, 29 Jun 2016)
Log Message:
-----------
squid/trunk: Move to real SM manifest
Modified Paths:
--------------
csw/mgar/pkg/squid/trunk/Makefile
csw/mgar/pkg/squid/trunk/files/cswsquid.xml
Property Changed:
----------------
csw/mgar/pkg/squid/trunk/files/cswsquid.xml
Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile 2016-06-28 11:30:24 UTC (rev 25791)
+++ csw/mgar/pkg/squid/trunk/Makefile 2016-06-29 12:01:05 UTC (rev 25792)
@@ -16,7 +16,11 @@
V12 = $(shell echo $(VERSION) | cut -d. -f1,2)
MASTER_SITES = http://www.squid-cache.org/Versions/v$(V1)/$(V12)/
DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += CSWsquid3.cswusergroup
+DISTFILES += cswsquid.xml
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
PACKAGES = CSWsquid
RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2
RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2
@@ -33,18 +37,19 @@
RUNTIME_DEP_PKGS_CSWsquid += CSWlibnettle6
RUNTIME_DEP_PKGS_CSWsquid += CSWlibgnutls28
+# This is the DTD for SMF
+CHECKPKG_OVERRIDES_CSWsquid +=
file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswsquid.xml
+
# Linker anomaly
CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibintl8
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+#INITSMF += /etc/opt/csw/init.d/cswsquid
+PRESERVECONF += /etc/opt/csw/squid/cachemgr.conf
+PRESERVECONF += /etc/opt/csw/squid/squid.conf
+PRESERVECONF += /etc/opt/csw/squid/mime.conf
+PRESERVECONF += /etc/opt/csw/squid/msntauth.conf
+PRESERVECONF += /etc/opt/csw/squid/errorpage.css
-INITSMF += /etc/opt/csw/init.d/csw$(NAME)
-PRESERVECONF += /etc/opt/csw/$(NAME)/cachemgr.conf
-PRESERVECONF += /etc/opt/csw/$(NAME)/squid.conf
-PRESERVECONF += /etc/opt/csw/$(NAME)/mime.conf
-PRESERVECONF += /etc/opt/csw/$(NAME)/msntauth.conf
-PRESERVECONF += /etc/opt/csw/$(NAME)/errorpage.css
-
MIGRATE_SOURCE_DIR = /opt/csw/etc
MIGRATE_DEST_DIR = /etc/opt/csw/$(NAME)
MIGRATE_FILES += cachemgr.conf
@@ -124,7 +129,7 @@
EXTRA_CPPFLAGS += -DDEFAULT_SQUID_CONF=\\\"$(sysconfdir)/$(NAME)/squid.conf\\\"
# /opt/csw/bdb48/include/db_185.h needs slightly different type names than
from sys/types.h
-EXTRA_CPPFLAGS += -Du_int32_t=uint32_t -Du_int16_t=uint16_t
+#EXTRA_CPPFLAGS += -Du_int32_t=uint32_t -Du_int16_t=uint16_t
# Expose deprecated krb5 API as krb5_get_in_tkt_with_keytab is used in
helpers/external_acl/kerberos_ldap_group/support_krb5.cc
# Add #define until this is fixed:
@@ -141,27 +146,31 @@
GARCOMPILER = GNU
-EXTRA_LIB += $(prefix)/bdb48/lib
-EXTRA_INC += $(prefix)/bdb48/include
+#EXTRA_LIB += $(prefix)/bdb48/lib
+#EXTRA_INC += $(prefix)/bdb48/include
# The testsuite requires cppunit
TEST_SCRIPTS =
-USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
+USERGROUP = /etc/opt/csw/pkg/CSWsquid/cswusergroup
-PROTOTYPE_MODIFIERS = varuser
+PROTOTYPE_MODIFIERS += varuser
PROTOTYPE_FILES_varuser = \/var\/opt\/csw\/$(NAME)\/cache
PROTOTYPE_FILES_varuser += \/var\/opt\/csw\/$(NAME)\/logs
PROTOTYPE_CLASS_varuser = ugfiles
-PROTOTYPE_USER_varuser = $(NAME)
-PROTOTYPE_GROUP_varuser = $(NAME)
+PROTOTYPE_USER_varuser = squid
+PROTOTYPE_GROUP_varuser = squid
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswsquid.xml
+PROTOTYPE_CLASS_smf = manifest
+
REINPLACE_USRLOCAL = $(mandir)/man8/squid_session.8
REINPLACE_WHEN_USRLOCAL = postinstall
REINPLACEMENTS += conf
REINPLACE_MATCH_conf = /usr/local/squid/etc/
-REINPLACE_WITH_conf = $(sysconfdir)/$(NAME)/
+REINPLACE_WITH_conf = $(sysconfdir)/squid/
REINPLACE_FILES_conf += helpers/basic_auth/MSNT/msntauth.conf.default
EXTRA_MERGE_EXCLUDE_FILES += .*\.default
@@ -174,10 +183,10 @@
post-install-modulated:
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs
- ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/cache
- ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)
- ginstall -m 755 $(FILEDIR)/cswsquid3
$(DESTDIR)/etc/opt/csw/init.d/csw$(NAME)
- ginstall -m 644 $(FILEDIR)/CSWsquid3.cswusergroup
$(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
+ ginstall -d $(DESTDIR)/var/opt/csw/squid/logs
+ ginstall -d $(DESTDIR)/var/opt/csw/squid/cache
+ #ginstall -m 755 $(FILEDIR)/cswsquid3
$(DESTDIR)/etc/opt/csw/init.d/csw$(NAME)
+ ginstall -D -m 0644 $(WORKDIR)/CSWsquid3.cswusergroup
$(DESTDIR)/etc/opt/csw/pkg/CSWsquid/cswusergroup
+ ginstall -D -m 0644 $(WORKDIR)/cswsquid.xml
$(DESTDIR)/var/opt/csw/svc/manifest/cswsquid.xml
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/squid/trunk/files/cswsquid.xml
===================================================================
(Binary files differ)
Index: csw/mgar/pkg/squid/trunk/files/cswsquid.xml
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid.xml 2016-06-28 11:30:24 UTC (rev
25791)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid.xml 2016-06-29 12:01:05 UTC (rev
25792)
Property changes on: csw/mgar/pkg/squid/trunk/files/cswsquid.xml
___________________________________________________________________
Modified: svn:mime-type
## -1 +1 ##
-application/xml
+text/plain
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
