Master squidguard updates travis

.travis.yml

@@ -0,0 +1,48 @@
+# Travis config file to build spk package
+# Credits to torrentalle, Safihre, ymartin59
+notifications:
+  email: false
+
+git:
+  depth: 1
+
+sudo: required
+language: false
+
+# Build environment configuration
+env:
+  global:
+    - PKG=squidguard
+  matrix:
+    - SYNOARCH=88f6281
+    - SYNOARCH=alpine
+    - SYNOARCH=armada370
+    - SYNOARCH=armada375
+    - SYNOARCH=armada38x
+    - SYNOARCH=armadaxp
+    - SYNOARCH=avoton
+    - SYNOARCH=braswell
+    - SYNOARCH=bromolow
+    - SYNOARCH=cedarview
+    - SYNOARCH=comcerto2k
+    - SYNOARCH=evansport
+    - SYNOARCH=monaco
+    - SYNOARCH=ppc853x
+    - SYNOARCH=qoriq
+    - SYNOARCH=x64
+    - SYNOARCH=x86
+
+# spksrc docker image
+services:
+  - docker
+
+before_install:
+  - docker pull synocommunity/spksrc
+
+# Build spk package
+script:
+  # Output is too verbose for TravisCI, so we hide it
+  # Remove the ">/dev/null" part to debug!
+  - docker run -it -v `pwd`:/spksrc synocommunity/spksrc /bin/bash -c "cd /spksrc && make setup && cd spk/$PKG && make arch-$SYNOARCH >/dev/null"
+  # make arch-$SYNOARCH always return exit code 0. This line is to test if SPK has been build.
+  - ls packages/${PKG}_${SYNOARCH}*.spk

cross/berkeleydb/Makefile

@@ -6,7 +6,7 @@ PKG_DIST_SITE = http://download.oracle.com/berkeley-db
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 SRC_DIR = build_unix
 
-DEPENDS = 
+DEPENDS =
 
 HOMEPAGE = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
 COMMENT  = Berkeley DB is a family of embedded key-value database libraries providing scalable high-performance data management services to applications. The Berkeley DB products use simple function-call APIs for data access and management.
@@ -17,6 +17,6 @@ CONFIGURE_TARGET = myConfigure
 include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: myConfigure
-myConfigure: 
-	$(RUN) dist/configure $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_DIR)/$(INSTALL_PREFIX) 
+myConfigure:
+	$(RUN) dist/configure $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_DIR)$(INSTALL_PREFIX)
 

cross/c_icap/Makefile

@@ -1,15 +1,15 @@
 PKG_NAME = c_icap
-PKG_VERS = 0.2.2
+PKG_VERS = 0.5.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://downloads.sourceforge.net/project/c-icap/c-icap/0.2.x
+PKG_DIST_SITE = http://downloads.sourceforge.net/project/c-icap/c-icap/0.5.x
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
 HOMEPAGE = http://c-icap.sourceforge.net/
 COMMENT  = c-icap is an implementation of an ICAP server. It can be used with HTTP proxies that support the ICAP protocol to implement content adaptation and filtering services.
-LICENSE  = 
+LICENSE  = LGPLv2
 
 PRE_CONFIGURE_TARGET = myConfigure
 GNU_CONFIGURE = 1

cross/c_icap/PLIST

@@ -8,6 +8,7 @@ lib:lib/c_icap/dnsbl_tables.so
 lib:lib/c_icap/srv_echo.so
 lib:lib/c_icap/srv_ex206.so
 lib:lib/c_icap/sys_logger.so
+lib:lib/c_icap/shared_cache.so
 lnk:lib/libicapapi.so
-lnk:lib/libicapapi.so.2
-lib:lib/libicapapi.so.2.0.2
+lnk:lib/libicapapi.so.5
+lib:lib/libicapapi.so.5.0.2

cross/c_icap/digests

@@ -0,0 +1,3 @@
+c_icap-0.5.2.tar.gz SHA1 fdb357eccbed37e0151a74a13430eec63dd76545
+c_icap-0.5.2.tar.gz SHA256 1a9ce61622176eaf068d97d6a00baedbbfca96002c5115c8147b41c95c8164ca
+c_icap-0.5.2.tar.gz MD5 c0ad392336eb401d1630174cc67c0f71

cross/squid/Makefile

@@ -1,19 +1,23 @@
 PKG_NAME = squid
-PKG_VERS = 3.1.22
+PKG_VERS_MAJOR = 3.5
+PKG_VERS_MINOR = 27
+PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://www.squid-cache.org/Versions/v3/3.1/
+PKG_DIST_SITE = http://www.squid-cache.org/Versions/v3/$(PKG_VERS_MAJOR)/
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = native/$(PKG_NAME)
+DEPENDS = native/$(PKG_NAME) cross/berkeleydb
 
 HOMEPAGE = http://www.squid-cache.org/
 COMMENT  = Squid is a fully-featured HTTP/1.0 proxy which is almost HTTP/1.1 compliant.
-LICENSE  = 
+LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
 
-CONFIGURE_ARGS  = $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_PREFIX) --enable-icap-client --disable-strict-error-checking
+PRE_CONFIGURE_TARGET = myPreConfigure
+
+CONFIGURE_ARGS  = $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_PREFIX) --enable-icap-client --disable-strict-error-checking --cache-file=config.cache
 
 HOSTCFGEN_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/$(PKG_DIR)/src/cf_gen
 HOSTCFGEN = $(WORK_DIR)/$(PKG_DIR)/src/cf_gen
@@ -23,5 +27,9 @@ PRE_COMPILE_TARGET = myPreCompile
 
 include ../../mk/spksrc.cross-cc.mk
 
+myPreConfigure:
+	echo "squid_cv_gnu_atomics=no" > $(WORK_DIR)/$(PKG_DIR)/config.cache
+	echo "ac_cv_dbopen_libdb=yes" >> $(WORK_DIR)/$(PKG_DIR)/config.cache
+
 myPreCompile:
 	cp $(HOSTCFGEN_NATIVE) $(HOSTCFGEN)

cross/squid/PLIST

@@ -5,30 +5,37 @@ etc:etc/errorpage.css
 etc:etc/errorpage.css.default
 etc:etc/mime.conf
 etc:etc/mime.conf.default
-etc:etc/msntauth.conf
-etc:etc/msntauth.conf.default
 etc:etc/squid.conf
 etc:etc/squid.conf.default
 etc:etc/squid.conf.documented
 rsc:libexec/cachemgr.cgi
-bin:libexec/digest_pw_auth
+bin:libexec/digest_file_auth
 bin:libexec/diskd
-bin:libexec/fakeauth_auth
-bin:libexec/getpwname_auth
-bin:libexec/msnt_auth
-bin:libexec/ncsa_auth
-rsc:libexec/no_check.pl
+bin:libexec/basic_fake_auth
+bin:libexec/basic_getpwnam_auth
+bin:libexec/basic_msnt_multi_domain_auth
+bin:libexec/basic_ncsa_auth
+bin:libexec/negotiate_wrapper_auth
 bin:libexec/ntlm_smb_lm_auth
-rsc:libexec/pop3.pl
-bin:libexec/smb_auth
-rsc:libexec/smb_auth.pl
-rsc:libexec/smb_auth.sh
-rsc:libexec/squid_db_auth
-bin:libexec/squid_radius_auth
-bin:libexec/squid_unix_group
+bin:libexec/ntlm_fake_auth
+bin:libexec/basic_pop3_auth
+bin:libexec/basic_smb_auth
+rsc:libexec/basic_smb_auth.sh
+bin:libexec/basic_radius_auth
+bin:libexec/basic_nis_auth
+bin:libexec/ext_file_userip_acl
+bin:libexec/storeid_file_rewrite
+bin:libexec/ext_session_acl
+bin:libexec/ext_wbinfo_group_acl
+bin:libexec/ext_sql_session_acl
+bin:libexec/ext_unix_group_acl
+bin:libexec/ext_delayer_acl
 bin:libexec/unlinkd
-rsc:libexec/wbinfo_group.pl
-bin:libexec/yp_auth
+bin:libexec/url_fake_rewrite
+rsc:libexec/url_fake_rewrite.sh
+rsc:libexec/helper-mux.pl
+bin:libexec/log_db_daemon
+bin:libexec/log_file_daemon
 rsc:share/errors/templates/ERR_ACCESS_DENIED
 rsc:share/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
 rsc:share/errors/templates/ERR_AGENT_CONFIGURE
@@ -447,30 +454,54 @@ rsc:share/errors/pt/ERR_URN_RESOLVE
 rsc:share/errors/pt/ERR_WRITE_ERROR
 rsc:share/errors/pt/ERR_ZERO_SIZE_OBJECT
 rsc:share/errors/pt-pt
-rsc:share/icons/anthony-binhex.gif
-rsc:share/icons/anthony-bomb.gif
-rsc:share/icons/anthony-box2.gif
-rsc:share/icons/anthony-box.gif
-rsc:share/icons/anthony-c.gif
-rsc:share/icons/anthony-compressed.gif
-rsc:share/icons/anthony-dir.gif
-rsc:share/icons/anthony-dirup.gif
-rsc:share/icons/anthony-dvi.gif
-rsc:share/icons/anthony-f.gif
-rsc:share/icons/anthony-image2.gif
-rsc:share/icons/anthony-image.gif
-rsc:share/icons/anthony-layout.gif
-rsc:share/icons/anthony-link.gif
-rsc:share/icons/anthony-movie.gif
-rsc:share/icons/anthony-pdf.gif
-rsc:share/icons/anthony-portal.gif
-rsc:share/icons/anthony-ps.gif
-rsc:share/icons/anthony-quill.gif
-rsc:share/icons/anthony-script.gif
-rsc:share/icons/anthony-sound.gif
-rsc:share/icons/anthony-tar.gif
-rsc:share/icons/anthony-tex.gif
-rsc:share/icons/anthony-text.gif
-rsc:share/icons/anthony-unknown.gif
-rsc:share/icons/anthony-xbm.gif
-rsc:share/icons/anthony-xpm.gif
+rsc:share/icons/silk/plugin_add.png
+rsc:share/icons/silk/picture.png
+rsc:share/icons/silk/layers.png
+rsc:share/icons/silk/bricks.png
+rsc:share/icons/silk/plugin.png
+rsc:share/icons/silk/page_white_flash.png
+rsc:share/icons/silk/film_key.png
+rsc:share/icons/silk/script_palette.png
+rsc:share/icons/silk/image.png
+rsc:share/icons/silk/application.png
+rsc:share/icons/silk/compress.png
+rsc:share/icons/silk/photo.png
+rsc:share/icons/silk/layout.png
+rsc:share/icons/silk/page_white_powerpoint.png
+rsc:share/icons/silk/information.png
+rsc:share/icons/silk/music.png
+rsc:share/icons/silk/folder.png
+rsc:share/icons/silk/page_excel.png
+rsc:share/icons/silk/page_green.png
+rsc:share/icons/silk/chart_line.png
+rsc:share/icons/silk/page_white_zip.png
+rsc:share/icons/silk/drive_disk.png
+rsc:share/icons/silk/package.png
+rsc:share/icons/silk/link.png
+rsc:share/icons/silk/package_go.png
+rsc:share/icons/silk/page_white_c.png
+rsc:share/icons/silk/page_white_magnify.png
+rsc:share/icons/silk/arrow_up.png
+rsc:share/icons/silk/page_white_cplusplus.png
+rsc:share/icons/silk/box.png
+rsc:share/icons/silk/database_table.png
+rsc:share/icons/silk/database.png
+rsc:share/icons/silk/page_white_stack.png
+rsc:share/icons/silk/computer_link.png
+rsc:share/icons/silk/page_white_word.png
+rsc:share/icons/silk/film.png
+rsc:share/icons/silk/page_world.png
+rsc:share/icons/silk/page_white_acrobat.png
+rsc:share/icons/silk/cup.png
+rsc:share/icons/silk/page_white_text.png
+rsc:share/icons/silk/css.png
+rsc:share/icons/silk/folder_table.png
+rsc:share/icons/silk/page_code.png
+rsc:share/icons/silk/page_white_picture.png
+rsc:share/icons/silk/script.png
+rsc:share/icons/silk/bomb.png
+rsc:share/icons/silk/bullet_red.png
+rsc:share/icons/silk/script_gear.png
+rsc:share/icons/silk/cd.png
+rsc:share/icons/silk/page_white.png
+rsc:share/icons/SN.png

cross/squidclamav/Makefile

@@ -1,11 +1,11 @@
 PKG_NAME = squidclamav
-PKG_VERS = 6.10
+PKG_VERS = 6.16
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://downloads.sourceforge.net/project/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS =
+DEPENDS = cross/c_icap
 
 HOMEPAGE = http://squidclamav.darold.net/
 COMMENT  = SquidClamav is an antivirus for Squid proxy based on the Awards winnings ClamAv anti-virus toolkit.
@@ -14,7 +14,7 @@ LICENSE  = GNU GPL v3
 GNU_CONFIGURE = 1
 PRE_COMPILE_TARGET = myPreCompile
 
-CONFIGURE_ARGS  = --prefix=$(INSTALL_PREFIX) --with-c-icap=$(INSTALL_DIR)/$(INSTALL_PREFIX)
+CONFIGURE_ARGS  = --prefix=$(INSTALL_PREFIX) --enable-icap-client --with-c-icap=$(INSTALL_DIR)/$(INSTALL_PREFIX)
 ADDITIONAL_CFLAGS = -I$(INSTALL_DIR)/$(INSTALL_PREFIX)/include/c_icap
 
 include ../../mk/spksrc.cross-cc.mk

cross/squidclamav/PLIST

@@ -1,4 +1,3 @@
-lib:lib/c_icap/squidclamav.so
 rsc:libexec/squidclamav/clwarn.cgi
 rsc:libexec/squidclamav/clwarn.cgi.de_DE
 rsc:libexec/squidclamav/clwarn.cgi.en_EN

cross/squidclamav/digests

@@ -0,0 +1,3 @@
+squidclamav-6.16.tar.gz SHA1 c54a2b4770815c5048f7313e9fb435c48738c9e3
+squidclamav-6.16.tar.gz SHA256 ed724841923f3e5a96dd7192a3cfd176df106eda250b417e7c85f515440c4978
+squidclamav-6.16.tar.gz MD5 d5c2e588b4162ed873aa678a47a65f0b