From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/squid/Makefile | 31 +++++++++++++--------- package/squid/files/squid.conffiles | 2 ++ .../ipkg/squid-mod-basic-auth-getpwnam.control | 5 ---- .../squid/ipkg/squid-mod-basic-auth-ncsa.control | 5 ---- .../squid/ipkg/squid-mod-basic-auth-smb.control | 5 ---- .../ipkg/squid-mod-basic-auth-winbind.control | 5 ---- .../ipkg/squid-mod-digest-auth-password.control | 5 ---- .../ipkg/squid-mod-external-acl-ip-user.control | 5 ---- .../ipkg/squid-mod-external-acl-unix-group.control | 5 ---- .../squid-mod-external-acl-winbind-group.control | 5 ---- .../ipkg/squid-mod-ntlm-auth-fakeauth.control | 5 ---- .../ipkg/squid-mod-ntlm-auth-smb-auth.control | 5 ---- .../ipkg/squid-mod-ntlm-auth-winbind-auth.control | 5 ---- package/squid/ipkg/squid.conffiles | 2 -- package/squid/ipkg/squid.control | 5 ---- 15 files changed, 20 insertions(+), 75 deletions(-) create mode 100644 package/squid/files/squid.conffiles delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-getpwnam.control delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-ncsa.control delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-smb.control delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-winbind.control delete mode 100644 package/squid/ipkg/squid-mod-digest-auth-password.control delete mode 100644 package/squid/ipkg/squid-mod-external-acl-ip-user.control delete mode 100644 package/squid/ipkg/squid-mod-external-acl-unix-group.control delete mode 100644 package/squid/ipkg/squid-mod-external-acl-winbind-group.control delete mode 100644 package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control delete mode 100644 package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control delete mode 100644 package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control delete mode 100644 package/squid/ipkg/squid.conffiles delete mode 100644 package/squid/ipkg/squid.control (limited to 'package/squid') diff --git a/package/squid/Makefile b/package/squid/Makefile index 3c1342221..c16cdd219 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -9,7 +9,12 @@ PKG_NAME:= squid PKG_VERSION:= 2.5.STABLE13 PKG_RELEASE:= 1 PKG_MD5SUM:= 3e64468e123be1246d17486dab6bee87 -MASTER_SITES:= http://www.squid-cache.org/Versions/v2/2.5/ +PKG_DESCR:= squid web and cache proxy +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl libpthread +PKG_URL:= http://www.squid-cache.org +PKG_SITES:= http://www.squid-cache.org/Versions/v2/2.5/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 AUTH_MODULES:=basic digest ntlm @@ -70,18 +75,18 @@ endef #endef -$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) #${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth}} #${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap}} diff --git a/package/squid/files/squid.conffiles b/package/squid/files/squid.conffiles new file mode 100644 index 000000000..cd06f9da5 --- /dev/null +++ b/package/squid/files/squid.conffiles @@ -0,0 +1,2 @@ +/etc/squid/mime.conf +/etc/squid/squid.conf diff --git a/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control b/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control deleted file mode 100644 index cc9dfe661..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-getpwnam -Section: net -Depends: squid -Priority: optional -Description: getpwnam basic authentication helper diff --git a/package/squid/ipkg/squid-mod-basic-auth-ncsa.control b/package/squid/ipkg/squid-mod-basic-auth-ncsa.control deleted file mode 100644 index 94b8e9ece..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-ncsa.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-ncsa -Section: net -Depends: squid -Priority: optional -Description: ncsa basic authentication helper diff --git a/package/squid/ipkg/squid-mod-basic-auth-smb.control b/package/squid/ipkg/squid-mod-basic-auth-smb.control deleted file mode 100644 index 9adbeaa01..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-smb.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-smb -Section: net -Depends: squid -Priority: optional -Description: Samba basic authentication helper diff --git a/package/squid/ipkg/squid-mod-basic-auth-winbind.control b/package/squid/ipkg/squid-mod-basic-auth-winbind.control deleted file mode 100644 index 49047fab5..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-winbind.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-winbind -Section: net -Depends: squid -Priority: optional -Description: winbind basic authentication helper diff --git a/package/squid/ipkg/squid-mod-digest-auth-password.control b/package/squid/ipkg/squid-mod-digest-auth-password.control deleted file mode 100644 index a78b61636..000000000 --- a/package/squid/ipkg/squid-mod-digest-auth-password.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-digest-auth-password -Section: net -Depends: squid -Priority: optional -Description: password digest authentication helper diff --git a/package/squid/ipkg/squid-mod-external-acl-ip-user.control b/package/squid/ipkg/squid-mod-external-acl-ip-user.control deleted file mode 100644 index eb613a370..000000000 --- a/package/squid/ipkg/squid-mod-external-acl-ip-user.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-ip-user -Section: net -Depends: squid -Priority: optional -Description: IP user external acl helper diff --git a/package/squid/ipkg/squid-mod-external-acl-unix-group.control b/package/squid/ipkg/squid-mod-external-acl-unix-group.control deleted file mode 100644 index 01614125f..000000000 --- a/package/squid/ipkg/squid-mod-external-acl-unix-group.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-unix-group -Section: net -Depends: squid -Priority: optional -Description: Unix group external acl helper diff --git a/package/squid/ipkg/squid-mod-external-acl-winbind-group.control b/package/squid/ipkg/squid-mod-external-acl-winbind-group.control deleted file mode 100644 index 308a32d46..000000000 --- a/package/squid/ipkg/squid-mod-external-acl-winbind-group.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-winbind-group -Section: net -Depends: squid -Priority: optional -Description: winbind group external acl helper diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control b/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control deleted file mode 100644 index 51779ec01..000000000 --- a/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-fakeauth -Section: net -Depends: squid -Priority: optional -Description: fakeauht NTLM authentication helper diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control b/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control deleted file mode 100644 index 1561bfa68..000000000 --- a/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-smb-auth -Section: net -Depends: squid -Priority: optional -Description: samba NTLM authentication helper diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control b/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control deleted file mode 100644 index 1480c2965..000000000 --- a/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-winbind-auth -Section: net -Depends: squid -Priority: optional -Description: winbind NTLM authentication helper diff --git a/package/squid/ipkg/squid.conffiles b/package/squid/ipkg/squid.conffiles deleted file mode 100644 index cd06f9da5..000000000 --- a/package/squid/ipkg/squid.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/squid/mime.conf -/etc/squid/squid.conf diff --git a/package/squid/ipkg/squid.control b/package/squid/ipkg/squid.control deleted file mode 100644 index 0657eb1ef..000000000 --- a/package/squid/ipkg/squid.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid -Section: net -Depends: libopenssl, libpthread -Priority: optional -Description: squid web and cache proxy -- cgit v1.2.3