From 5d755ffab8bb2b35e0202d54b86a14f332a73713 Mon Sep 17 00:00:00 2001 From: Yves Martin Date: Tue, 29 Aug 2017 21:27:03 +0200 Subject: [PATCH 1/3] SquidGuard dependencies updates c_icap 0.5.2 squidclamav 6.16 unrar 5.5.8 --- cross/berkeleydb/Makefile | 6 +- cross/c_icap/Makefile | 6 +- cross/c_icap/PLIST | 5 +- cross/c_icap/digests | 3 + cross/c_icap/patches/001-configure.in.patch | 72 ----------- cross/c_icap/patches/002-Makefile.in.patch | 11 -- cross/squid/Makefile | 18 ++- cross/squid/PLIST | 119 +++++++++++------- cross/squidclamav/Makefile | 6 +- cross/squidclamav/PLIST | 1 - cross/squidclamav/digests | 3 + .../patches/001-add-destdir-flags.patch | 20 --- cross/squidguard/Makefile | 3 +- cross/squidguard/PLIST | 7 -- cross/squidguardmanager/Makefile | 12 +- cross/unrar/Makefile | 2 +- native/squid/Makefile | 10 +- spk/squidguard/README | 11 -- 18 files changed, 121 insertions(+), 194 deletions(-) create mode 100644 cross/c_icap/digests delete mode 100644 cross/c_icap/patches/001-configure.in.patch delete mode 100644 cross/c_icap/patches/002-Makefile.in.patch create mode 100644 cross/squidclamav/digests delete mode 100644 cross/squidclamav/patches/001-add-destdir-flags.patch delete mode 100644 spk/squidguard/README diff --git a/cross/berkeleydb/Makefile b/cross/berkeleydb/Makefile index c07a8648e57..1a374e362c4 100644 --- a/cross/berkeleydb/Makefile +++ b/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) diff --git a/cross/c_icap/Makefile b/cross/c_icap/Makefile index 01a6c4b03f6..d62169e11d9 100644 --- a/cross/c_icap/Makefile +++ b/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 diff --git a/cross/c_icap/PLIST b/cross/c_icap/PLIST index 60e8390b45a..454f89a1dba 100644 --- a/cross/c_icap/PLIST +++ b/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 diff --git a/cross/c_icap/digests b/cross/c_icap/digests new file mode 100644 index 00000000000..949c3e1bf24 --- /dev/null +++ b/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 diff --git a/cross/c_icap/patches/001-configure.in.patch b/cross/c_icap/patches/001-configure.in.patch deleted file mode 100644 index 5783a513631..00000000000 --- a/cross/c_icap/patches/001-configure.in.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- configure.in.ori 2010-12-21 17:50:08.000000000 +0100 -+++ configure.in 2011-06-10 00:24:06.000000000 +0200 -@@ -557,10 +557,8 @@ - ) - - dnl Checking if interprocess posix semaphores works.... --POSIX_SEMAPHORES="0" --AC_MSG_CHECKING(if posix 1003.1b interprocess semaphores works) --AC_TRY_RUN( --[ -+AC_CACHE_CHECK([if posix 1003.1b interprocess semaphores works], ac_cv_10031b_ipc_sem, -+[AC_TRY_RUN([ - #include - #include - -@@ -586,18 +484,24 @@ - exit(0); - } - ], --AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works]) --POSIX_SEMAPHORES="1" --AC_MSG_RESULT(yes), --AC_MSG_RESULT(no) -+ac_cv_10031b_ipc_sem=yes, -+ac_cv_10031b_ipc_sem=no, -+[AC_MSG_ERROR([cross-compiling, -+ presetting ac_cv_10031b_ipc_sem=(yes|no) will help])] - ) -+]) -+AS_IF( -+ [test $ac_cv_10031b_ipc_sem = yes], -+ [AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works]) -+ POSIX_SEMAPHORES="1" -+ ],[ -+ POSIX_SEMAPHORES="0" -+ ]) - AC_SUBST(POSIX_SEMAPHORES) - - dnl Checking for file locking --POSIX_FILE_LOCK="0" --AC_MSG_CHECKING(if fcntl file locking works) --AC_TRY_RUN( --[ -+AC_CACHE_CHECK([if fcntl file locking works], ac_cv_fcntl, -+[AC_TRY_RUN([ - #include - #include - -@@ -621,11 +625,19 @@ - return 0; - } - ], --AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works]) --POSIX_FILE_LOCK="1" --AC_MSG_RESULT(yes), --AC_MSG_RESULT(no) -+ac_cv_fcntl=yes, -+ac_cv_fcntl=no, -+[AC_MSG_ERROR([cross-compiling, -+ presetting ac_cv_fcntl=(yes|no) will help])] - ) -+]) -+AS_IF( -+ [test $ac_cv_fcntl = yes], -+ [AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works]) -+ POSIX_FILE_LOCK="1" -+ ],[ -+ POSIX_FILE_LOCK="0" -+ ]) - AC_SUBST(POSIX_FILE_LOCK) - - #pthread_rwlock diff --git a/cross/c_icap/patches/002-Makefile.in.patch b/cross/c_icap/patches/002-Makefile.in.patch deleted file mode 100644 index 749f7df4a65..00000000000 --- a/cross/c_icap/patches/002-Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2012-10-04 10:40:39.000000000 +0200 -+++ Makefile.in 2012-10-04 10:42:06.000000000 +0200 -@@ -354,7 +354,7 @@ - #CONFIGDIR=$(sysconfdir)/ - DATADIR = $(pkgdatadir)/ - LOGDIR = $(localstatedir)/log/ --SOCKDIR = /var/run/c-icap -+SOCKDIR = $(localstatedir)/run/c-icap - DOXYGEN = @doxygen_bin@ - SUBDIRS = . utils modules services tests docs - lib_LTLIBRARIES = libicapapi.la diff --git a/cross/squid/Makefile b/cross/squid/Makefile index f424bd3b470..291ebef8948 100644 --- a/cross/squid/Makefile +++ b/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) diff --git a/cross/squid/PLIST b/cross/squid/PLIST index c2013422196..aa70d2d5b86 100644 --- a/cross/squid/PLIST +++ b/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 diff --git a/cross/squidclamav/Makefile b/cross/squidclamav/Makefile index c20e94cbaf6..58435eb55be 100644 --- a/cross/squidclamav/Makefile +++ b/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 diff --git a/cross/squidclamav/PLIST b/cross/squidclamav/PLIST index f580762d546..60b3ee50240 100644 --- a/cross/squidclamav/PLIST +++ b/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 diff --git a/cross/squidclamav/digests b/cross/squidclamav/digests new file mode 100644 index 00000000000..a93f2fe6cab --- /dev/null +++ b/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 diff --git a/cross/squidclamav/patches/001-add-destdir-flags.patch b/cross/squidclamav/patches/001-add-destdir-flags.patch deleted file mode 100644 index 70b99f10a85..00000000000 --- a/cross/squidclamav/patches/001-add-destdir-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- etc/Makefile.in.orig 2012-10-04 11:58:03.000000000 +0200 -+++ etc/Makefile.in 2012-10-04 12:02:05.000000000 +0200 -@@ -168,6 +168,7 @@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = squidclamav.conf - CFGINST = @CFGDIR@ -+DESTDIR = $(prefix) - all: all-am - - .SUFFIXES: ---- src/Makefile.in.orig 2012-10-04 12:06:28.000000000 +0200 -+++ src/Makefile.in 2012-10-04 12:07:15.000000000 +0200 -@@ -198,6 +198,7 @@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir) - CONFIGDIR = @CONFDIR@ -+DESTDIR = $(prefix)/../../../ - cicapmoduledir = @MODSDIR@ - cicapmodule_LTLIBRARIES = squidclamav.la - squidclamav_la_LIBADD = @MODULES_LIBADD@ diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index 465f4f91d4d..e114f51a52b 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://www.squidguard.org/Downloads/Devel/ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DB_FILE= ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz -DEPENDS = +DEPENDS = HOMEPAGE = http://www.squidguard.org/ COMMENT = SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. @@ -17,6 +17,7 @@ POST_INSTALL_TARGET = myInstall include ../../mk/spksrc.cross-cc.mk +USER := $(shell whoami) CONFIGURE_ARGS = --with-db=$(INSTALL_DIR)/$(INSTALL_PREFIX) --exec-prefix=$(INSTALL_DIR)/$(INSTALL_PREFIX) -with-sg-dbhome=$(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db --with-sg-config=$(INSTALL_DIR)/$(INSTALL_PREFIX)/etc/squidguard.conf --with-sg-logdir=$(INSTALL_DIR)/$(INSTALL_PREFIX)/var/logs --with-squiduser=$(USER) -with-mysql=no --with-ldap-inc=no diff --git a/cross/squidguard/PLIST b/cross/squidguard/PLIST index 243ed291eb3..df2e3491e3b 100644 --- a/cross/squidguard/PLIST +++ b/cross/squidguard/PLIST @@ -1,12 +1,5 @@ bin:bin/squidGuard rsc:share/www/squidguardmgr/squidGuard.cgi -rsc:share/www/squidguardmgr/babel.en -rsc:share/www/squidguardmgr/babel.fr -rsc:share/www/squidguardmgr/babel.de -rsc:share/www/squidguardmgr/babel.es -rsc:share/www/squidguardmgr/babel.nl -rsc:share/www/squidguardmgr/babel.no -rsc:share/www/squidguardmgr/babel.ru lnk:var/db/ads rsc:var/db/adult/domains rsc:var/db/adult/expressions diff --git a/cross/squidguardmanager/Makefile b/cross/squidguardmanager/Makefile index ade8ee84083..b27e8e6fee8 100644 --- a/cross/squidguardmanager/Makefile +++ b/cross/squidguardmanager/Makefile @@ -25,9 +25,9 @@ $(SRC_DIR)squid_wrapper/squid_wrapper: .PHONY: myInstall myInstall: - @$(RUN) mkdir -p $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr - @$(RUN) cp $(SRC_DIR)squid_wrapper/squid_wrapper $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/ - @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/cgi-bin/* $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/ - @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/htdocs/* $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/ - @$(RUN) chmod 775 $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/*cgi - @$(RUN) chmod 755 $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/squid_wrapper + @$(RUN) mkdir -p $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr + @$(RUN) cp $(SRC_DIR)squid_wrapper/squid_wrapper $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr/ + @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/cgi-bin/* $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr/ + @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/htdocs/* $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr/ + @$(RUN) chmod 775 $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr/*cgi + @$(RUN) chmod 755 $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr/squid_wrapper diff --git a/cross/unrar/Makefile b/cross/unrar/Makefile index 7dcf7a67c64..639fd40b815 100644 --- a/cross/unrar/Makefile +++ b/cross/unrar/Makefile @@ -2,7 +2,7 @@ PKG_NAME = unrar PKG_VERS = 5.5.8 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)src-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = ftp://ftp.rarlab.com/rar +PKG_DIST_SITE = http://www.rarlab.com/rar PKG_DIR = $(PKG_NAME) DEPENDS = diff --git a/native/squid/Makefile b/native/squid/Makefile index 81e3188970a..38376cdb545 100644 --- a/native/squid/Makefile +++ b/native/squid/Makefile @@ -1,15 +1,17 @@ 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 = +DEPENDS = 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 diff --git a/spk/squidguard/README b/spk/squidguard/README deleted file mode 100644 index d16ba7edbbe..00000000000 --- a/spk/squidguard/README +++ /dev/null @@ -1,11 +0,0 @@ -error cf_gen : - -make cf_gen for native build : -untar squid package en cd intio squid directory -./configure -make -C lib -make -C src -cp cf_gen .../spk/squidguard/work.../squid-*/src/ - -run make for target architecture again - From 3b3cb3be280aef9059d1a58f3266f441d27fdf50 Mon Sep 17 00:00:00 2001 From: Yves Martin Date: Sun, 3 Sep 2017 21:26:31 +0200 Subject: [PATCH 2/3] Base Travis build description --- .travis.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..910724ff03a --- /dev/null +++ b/.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= + 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 From 80f8fdf3f4df92a2d00b4a90ae2bda5eab9845a3 Mon Sep 17 00:00:00 2001 From: Yves Martin Date: Sun, 3 Sep 2017 21:28:07 +0200 Subject: [PATCH 3/3] Trigger squidguard build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 910724ff03a..0af4b3d1d1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ language: false # Build environment configuration env: global: - - PKG= + - PKG=squidguard matrix: - SYNOARCH=88f6281 - SYNOARCH=alpine