Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 461142 Details for
Bug 606994
net-proxy/squid ebuild patch to support upstream patch releases and beta versions
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
squid ebuild patch
squid-3.5.23.ebuild.diff (text/plain), 5.89 KB, created by
Vieri
on 2017-01-24 09:18:35 UTC
(
hide
)
Description:
squid ebuild patch
Filename:
MIME Type:
Creator:
Vieri
Created:
2017-01-24 09:18:35 UTC
Size:
5.89 KB
patch
obsolete
>--- /usr/portage/net-proxy/squid/squid-3.5.23.ebuild 2017-01-14 13:54:30.000000000 +0100 >+++ /usr/local/portage/net-proxy/squid/squid-3.5.23_p2016122614129.ebuild 2017-01-23 21:38:46.000000000 +0100 >@@ -3,15 +3,36 @@ > # $Id$ > > EAPI=6 >-inherit autotools linux-info pam toolchain-funcs user >+inherit autotools linux-info pam toolchain-funcs user versionator >+ >+MY_VERSION_NUMBER=$(get_version_component_range 1) >+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) >+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) >+MY_RELEASE_TYPE=$(get_version_component_range 4-) >+ >+MY_SRC_URI_HELPER="/${MY_MAJOR_RELEASE_NUMBER}" >+if [[ ${MY_RELEASE_TYPE} = *beta* ]]; then >+ MY_RELEASE_TYPE=${MY_RELEASE_TYPE##beta_} >+ MY_RELEASE_TYPE=${MY_RELEASE_TYPE##beta} >+ MY_SRC_URI_HELPER="" >+ KEYWORDS="" >+else >+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" >+fi >+if [[ ${MY_RELEASE_TYPE} = p* ]]; then >+ MY_UPSTREAM_REVISION=${MY_RELEASE_TYPE:9} >+ [ ${#MY_UPSTREAM_REVISION} -gt 0 ] && MY_UPSTREAM_REVISION="-${MY_RELEASE_TYPE:0:9}-r${MY_UPSTREAM_REVISION}" >+ MY_UPSTREAM_REVISION=${MY_UPSTREAM_REVISION/-p/-} >+fi > > DESCRIPTION="A full-featured web proxy cache" > HOMEPAGE="http://www.squid-cache.org/" >-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" >+SRC_URI="http://www.squid-cache.org/Versions/v${MY_VERSION_NUMBER}${MY_SRC_URI_HELPER}/${PN}-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_UPSTREAM_REVISION}.tar.bz2" >+ >+S="${WORKDIR}/${PN}-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_UPSTREAM_REVISION}" > > LICENSE="GPL-2" > SLOT="0" >-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" > IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \ > ecap esi ssl-crtd \ > mysql postgres sqlite \ >@@ -63,14 +84,32 @@ > } > > src_prepare() { >- eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch" >+ if [[ ${P} = *_beta* ]]; then >+ eapply "${FILESDIR}/${PN}-4.0.17-gentoo.patch" >+ sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ >+ src/acl/external/session/ext_session_acl.8 \ >+ src/acl/external/unix_group/ext_unix_group_acl.8 || die >+ else >+ eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch" >+ sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ >+ tools/purge/README || die >+ sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ >+ helpers/external_acl/unix_group/ext_unix_group_acl.8 \ >+ helpers/external_acl/session/ext_session_acl.8 \ >+ src/ssl/ssl_crtd.8 || die >+ sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ >+ src/ssl/ssl_crtd.8 || die >+ sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ >+ src/ssl/ssl_crtd.8 || die >+ sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ >+ src/ssl/ssl_crtd.8 || die >+ fi > sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ > INSTALL QUICKSTART \ > scripts/fileno-to-pathname.pl \ > scripts/check_cache.pl \ > tools/cachemgr.cgi.8 \ >- tools/purge/conffile.hh \ >- tools/purge/README || die >+ tools/purge/conffile.hh || die > sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ > INSTALL QUICKSTART || die > sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ >@@ -80,18 +119,8 @@ > src/log/access_log.cc || die > sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ > src/log/access_log.cc || die >- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ >- helpers/external_acl/unix_group/ext_unix_group_acl.8 \ >- helpers/external_acl/session/ext_session_acl.8 \ >- src/ssl/ssl_crtd.8 || die > sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ > scripts/check_cache.pl || die >- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ >- src/ssl/ssl_crtd.8 || die >- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ >- src/ssl/ssl_crtd.8 || die >- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ >- src/ssl/ssl_crtd.8 || die > # /var/run/squid to /run/squid > sed -i -e 's:$(localstatedir)::' \ > src/ipc/Makefile.am || die >@@ -103,7 +132,8 @@ > } > > src_configure() { >- local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam" >+ local basic_modules="NCSA,POP3,getpwnam" >+ [[ ${P} = *_beta* ]] || basic_modules+=",MSNT-multi-domain" > use samba && basic_modules+=",SMB" > use ldap && basic_modules+=",LDAP" > use pam && basic_modules+=",PAM" >@@ -129,7 +159,9 @@ > fi > > local ntlm_modules="none" >- use samba && ntlm_modules="smb_lm" >+ if use samba ; then >+ [[ ${P} = *_beta* ]] && ntlm_modules="SMB_LM" || ntlm_modules="smb_lm" >+ fi > > local ext_helpers="file_userip,session,unix_group" > use samba && ext_helpers+=",wbinfo_group" >@@ -218,11 +250,17 @@ > rm -rf "${D}"/run/squid "${D}"/var/cache/squid > > dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt >- newdoc helpers/negotiate_auth/kerberos/README README.kerberos >- newdoc helpers/basic_auth/RADIUS/README README.RADIUS >- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group >- newdoc tools/purge/README README.purge >- newdoc tools/helper-mux.README README.helper-mux >+ if [[ ${P} = *_beta* ]]; then >+ newdoc src/auth/negotiate/kerberos/README README.kerberos >+ newdoc src/auth/basic/RADIUS/README README.RADIUS >+ newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group >+ else >+ newdoc helpers/negotiate_auth/kerberos/README README.kerberos >+ newdoc helpers/basic_auth/RADIUS/README README.RADIUS >+ newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group >+ newdoc tools/purge/README README.purge >+ newdoc tools/helper-mux.README README.helper-mux >+ fi > dodoc RELEASENOTES.html > > newpamd "${FILESDIR}/squid.pam" squid >@@ -239,3 +277,9 @@ > diropts -m0750 -o squid -g squid > keepdir /var/log/squid /etc/ssl/squid /var/lib/squid > } >+ >+pkg_postinst() { >+ [[ ${P} = *_beta* ]] && elog "You are using the beta version! It is for testing purposes only." >+ >+ [[ ${P} = *_p* ]] && elog "You are using a patched upstream release! Make sure you mention that when asking for support." >+}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 606994
:
461140
| 461142 |
496994