get rid of webadmin/webmail/fax files if not needed (75b4100) - keks-overlay.git

get rid of webadmin/webmail/fax files if not needed

Bernd Wurst commited on 2008-03-10 08:22:44
Zeige 5 geänderte Dateien mit 66 Einfügungen und 7 Löschungen.

mail-mtcourier/Manifest 43b5e2d..6c80b27
mail-mtcourier/courier-0.58.0.ebuild 126fdd3..6c919cc
mail-mtcourier/files/fax_files 0000000..66a3f09
mail-mtcourier/files/webadmin_files 0000000..ca049ba
mail-mtcourier/files/webmail_files 0000000..73f26f0

@@ -2,10 +2,13 @@ AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA
 AUX courier-0.48.1-spf-error-handling.patch 318 RMD160 3051e323b9564e9e31d9593ef2a1afb76ed45a3f SHA1 75c93cbf98806bc94da91b96daab39aec071851d SHA256 f6f706470cab4bffb45f6ef196799a1c596e8abf5cbef1b5e3d22287c990298b
 AUX courier-init-r1 5252 RMD160 2c770526b4fd2e342c904289573c4f8cb19ca6df SHA1 ac67cd4a9664b1010322b5260f84d017ee06736b SHA256 e74fc291b49dace3ffb3af1844b976255c0c7a34aa0e2d87b5c05f672db9058a
 AUX fam-disable-check.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
+AUX fax_files 232 RMD160 bb9a71788d2556b87f4a3a8b03ac947e6c5cc5d7 SHA1 a97a8fee928902e4d1210b95e620a4d640080eef SHA256 cc5a097299a67bb48b387f4c175605e5645e5c2c3f5466368152cc230c1e9e0e
 AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf095797e8c526dc5fec59d9d89d51f318cd28a SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47
 AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007059af9ab5d89b36004e590b6a21911515f69b SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4
 AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5bcf561f7267be6f18b731813962030af166 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2
 AUX remove-sysconftool.patch 1462 RMD160 e7cf6c03ff92840278eed734ed62920ed5095bfe SHA1 70910e9a4e39b7b9474d8354f67dd344559dadcb SHA256 bcd99b15bffa735a7ce219ddf52f018c3bc630b5b95b928e7ba7652ee3cff298
+AUX webadmin_files 164 RMD160 56b30ab7b07aae197d5854f964cdef62201055d5 SHA1 f5962037dec133016b17b797b959f04f7f995968 SHA256 94b13ac04a299ccb2b6baaf4b9eba5772f72c57e39b0d52ed28971a77f77ad99
+AUX webmail_files 334 RMD160 f791304987a7ddc324b116477b71f4b7180a34c3 SHA1 dcfad62f80874e910a3da3d7d847ec3576de7019 SHA256 37b9887a8d7ac9f02482befe89106b2241502df7183a9ded7b8fdcaabced7863
 DIST courier-0.58.0.tar.bz2 7123136 RMD160 940fb7967d154aeeb462691beb508155b3df4e29 SHA1 964d81e6de5390678c9f10dddbc176273b925f6d SHA256 d61db181df19a2deb0ff31356665042d79b718efbab6b1615b6b1ce5c8de5742
-EBUILD courier-0.58.0.ebuild 10328 RMD160 ff19ecaacb263e7b9313369c6c16340c9673f7b6 SHA1 78e50097cc32fbfb7106b60c70b47bd547af5204 SHA256 34a4e63980a097e33163cb178058a97734bfa8012d1376edc8f0562bed9e7839
+EBUILD courier-0.58.0.ebuild 11083 RMD160 9760b25575c0b1b07a43c4c9c35895141a2adaa4 SHA1 873898d0baf4cce6d803d33a46b9ded2c7600691 SHA256 f866f02bc555f7a86f9ef4aa5019e89809a85cba6cd08a9267943167c81b0605
 MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0

mail-mtcourier/courier-0.58.0.ebuild

Zeige Datei @ 75b4100

@@ -18,7 +18,8 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+	fam nowebmail nowebadmin"
 
 PROVIDE="virtual/mta
 	 virtual/mda
@@ -66,6 +67,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/remove-sysconftool.patch"
 
+	# some libtool version mismatch
 	_elibtoolize --copy --force || die
 }
 
@@ -81,6 +83,18 @@ src_compile() {
 
 	myconf="${myconf} $(use_with fam)"
 	
+	#myconf="${myconf} --without-webmail --without-webadmin"
+
+	#if use nowebadmin ; then
+	#	sed -i -e 's:\(^ac_subdirs_all=.*\)webadmin \(.*$\):\1\2:' configure
+	#fi
+	#
+	#if use nowebmail ; then
+	#	sed -i -e 's:\(^ac_subdirs_all=.*\)webmail \(.*$\):\1\2:' configure
+	#	sed -i -e 's:\(^ac_subdirs_all=.*\)ldapaddressbook \(.*$\):\1\2:' configure
+	#	sed -i -e 's:\(^ac_subdirs_all=.*\)gpglib \(.*$\):\1\2:' configure
+	#fi
+
 	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
 
 	econf \
@@ -132,6 +146,22 @@ src_install() {
 	make install DESTDIR=${D} || die "install"
 	make install-configure || die "install-configure"
 
+	# Get rid of files we dont want
+	if use nowebmail ; then
+		cd ${D}
+		cat ${FILESDIR}/webmail_files | xargs rm -rf
+	fi
+
+	if use nowebadmin ; then
+		cd ${D}
+		cat ${FILESDIR}/webadmin_files | xargs rm -rf
+	fi
+
+	if ! use fax ; then
+		cd ${D}
+		cat ${FILESDIR}/fax_files | xargs rm -rf
+	fi
+
 	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
 		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
 	done
@@ -140,13 +170,9 @@ src_install() {
 	use fam || sed -i -e's|^.*use famd$||g' ${D}/etc/init.d/courier
 
 	cd ${D}/etc/courier
+	if ! use nowebmail ; then
 		insinto /etc/courier
 		newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
 	fi
 
 	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
@@ -199,17 +225,22 @@ src_install() {
 	dodoc tcpd/README.couriertls
 	mv ${D}/usr/share/courier/htmldoc ${D}/usr/share/doc/${P}/html
 
+	if ! use nowebmail ; then
 		insinto /usr/$(get_libdir)/courier/courier
 		insopts -m 755 -o mail -g mail
 		doins ${S}/courier/webmaild
+	fi
 
+	if ! use nowebadmin ; then
 		insinto /etc/courier/webadmin
 		insopts -m 400 -o mail -g mail
 		doins ${FILESDIR}/password.dist
+	fi
 
 	# avoid name collisions in /usr/sbin, make webadmin match
 	cd ${D}/usr/sbin
 	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
+	if ! use nowebadmin ; then
 		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
 			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
 			${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
@@ -218,6 +249,7 @@ src_install() {
 			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
 			${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
 			|| ewarn "failed to fix webadmin"
+	fi
 
 	# users should be able to send mail. Could be restricted with suictl.
 	chmod u+s ${D}/usr/bin/sendmail

mail-mtcourier/files/fax_files

Zeige Datei @ 75b4100

...	...	@@ -0,0 +1,8 @@
	1	+./var/lib/courier/faxtmp
	2	+./usr/share/courier/faxmail
	3	+./usr/share/man/man8/courierfax.8.bz2
	4	+./usr/lib64/courier/courier/modules/fax
	5	+./etc/courier/module.fax
	6	+./etc/courier/faxcoverpage.tr
	7	+./etc/courier/faxnotifyrc
	8	+./etc/courier/faxrc

mail-mtcourier/files/webadmin_files

Zeige Datei @ 75b4100

...	...	@@ -0,0 +1,5 @@
	1	+./usr/share/courier/courierwebadmin
	2	+./usr/lib64/courier/courier/webmail/webadmin
	3	+./etc/courier/webadmin
	4	+./etc/courier/webadmin/added
	5	+./etc/courier/webadmin/removed

mail-mtcourier/files/webmail_files

Zeige Datei @ 75b4100

...	...	@@ -0,0 +1,11 @@
	1	+var/lib/courier/webmail-logincache
	2	+usr/share/courier/sqwebmail
	3	+usr/lib64/courier/courier/sqwebpasswd
	4	+usr/lib64/courier/courier/sqwebmaild
	5	+usr/lib64/courier/courier/webmail/webmail
	6	+usr/lib64/courier/courier/webmail/webmlm
	7	+usr/sbin/webmaild
	8	+usr/sbin/webgpg
	9	+etc/courier/sqwebmaild.dist
	10	+etc/courier/webmail.authpam
	11	+etc/courier/sqwebmaild
0	12

...	...	@@ -2,10 +2,13 @@ AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA
2	2	AUX courier-0.48.1-spf-error-handling.patch 318 RMD160 3051e323b9564e9e31d9593ef2a1afb76ed45a3f SHA1 75c93cbf98806bc94da91b96daab39aec071851d SHA256 f6f706470cab4bffb45f6ef196799a1c596e8abf5cbef1b5e3d22287c990298b
3	3	AUX courier-init-r1 5252 RMD160 2c770526b4fd2e342c904289573c4f8cb19ca6df SHA1 ac67cd4a9664b1010322b5260f84d017ee06736b SHA256 e74fc291b49dace3ffb3af1844b976255c0c7a34aa0e2d87b5c05f672db9058a
4	4	AUX fam-disable-check.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
	5	+AUX fax_files 232 RMD160 bb9a71788d2556b87f4a3a8b03ac947e6c5cc5d7 SHA1 a97a8fee928902e4d1210b95e620a4d640080eef SHA256 cc5a097299a67bb48b387f4c175605e5645e5c2c3f5466368152cc230c1e9e0e
5	6	AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf095797e8c526dc5fec59d9d89d51f318cd28a SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47
6	7	AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007059af9ab5d89b36004e590b6a21911515f69b SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4
7	8	AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5bcf561f7267be6f18b731813962030af166 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2
8	9	AUX remove-sysconftool.patch 1462 RMD160 e7cf6c03ff92840278eed734ed62920ed5095bfe SHA1 70910e9a4e39b7b9474d8354f67dd344559dadcb SHA256 bcd99b15bffa735a7ce219ddf52f018c3bc630b5b95b928e7ba7652ee3cff298
	10	+AUX webadmin_files 164 RMD160 56b30ab7b07aae197d5854f964cdef62201055d5 SHA1 f5962037dec133016b17b797b959f04f7f995968 SHA256 94b13ac04a299ccb2b6baaf4b9eba5772f72c57e39b0d52ed28971a77f77ad99
	11	+AUX webmail_files 334 RMD160 f791304987a7ddc324b116477b71f4b7180a34c3 SHA1 dcfad62f80874e910a3da3d7d847ec3576de7019 SHA256 37b9887a8d7ac9f02482befe89106b2241502df7183a9ded7b8fdcaabced7863
9	12	DIST courier-0.58.0.tar.bz2 7123136 RMD160 940fb7967d154aeeb462691beb508155b3df4e29 SHA1 964d81e6de5390678c9f10dddbc176273b925f6d SHA256 d61db181df19a2deb0ff31356665042d79b718efbab6b1615b6b1ce5c8de5742
10		-EBUILD courier-0.58.0.ebuild 10328 RMD160 ff19ecaacb263e7b9313369c6c16340c9673f7b6 SHA1 78e50097cc32fbfb7106b60c70b47bd547af5204 SHA256 34a4e63980a097e33163cb178058a97734bfa8012d1376edc8f0562bed9e7839
	13	+EBUILD courier-0.58.0.ebuild 11083 RMD160 9760b25575c0b1b07a43c4c9c35895141a2adaa4 SHA1 873898d0baf4cce6d803d33a46b9ded2c7600691 SHA256 f866f02bc555f7a86f9ef4aa5019e89809a85cba6cd08a9267943167c81b0605
11	14	MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0

...	...	@@ -18,7 +18,8 @@ SLOT="0"
18	18	LICENSE="GPL-2"
19	19	# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
20	20	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
21		-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
	21	+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
	22	+ fam nowebmail nowebadmin"
22	23
23	24	PROVIDE="virtual/mta
24	25	virtual/mda
...	...	@@ -66,6 +67,7 @@ src_unpack() {
66	67
67	68	epatch "${FILESDIR}/remove-sysconftool.patch"
68	69
	70	+ # some libtool version mismatch
69	71	_elibtoolize --copy --force \|\| die
70	72	}
71	73
...	...	@@ -81,6 +83,18 @@ src_compile() {
81	83
82	84	myconf="${myconf} $(use_with fam)"
83	85
	86	+ #myconf="${myconf} --without-webmail --without-webadmin"
	87	+
	88	+ #if use nowebadmin ; then
	89	+ # sed -i -e 's:\(^ac_subdirs_all=.\)webadmin \(.$\):\1\2:' configure
	90	+ #fi
	91	+ #
	92	+ #if use nowebmail ; then
	93	+ # sed -i -e 's:\(^ac_subdirs_all=.\)webmail \(.$\):\1\2:' configure
	94	+ # sed -i -e 's:\(^ac_subdirs_all=.\)ldapaddressbook \(.$\):\1\2:' configure
	95	+ # sed -i -e 's:\(^ac_subdirs_all=.\)gpglib \(.$\):\1\2:' configure
	96	+ #fi
	97	+
84	98	einfo "Configuring courier: `echo ${myconf} \| xargs echo`"
85	99
86	100	econf \
...	...	@@ -132,6 +146,22 @@ src_install() {
132	146	make install DESTDIR=${D} \|\| die "install"
133	147	make install-configure \|\| die "install-configure"
134	148
	149	+ # Get rid of files we dont want
	150	+ if use nowebmail ; then
	151	+ cd ${D}
	152	+ cat ${FILESDIR}/webmail_files \| xargs rm -rf
	153	+ fi
	154	+
	155	+ if use nowebadmin ; then
	156	+ cd ${D}
	157	+ cat ${FILESDIR}/webadmin_files \| xargs rm -rf
	158	+ fi
	159	+
	160	+ if ! use fax ; then
	161	+ cd ${D}
	162	+ cat ${FILESDIR}/fax_files \| xargs rm -rf
	163	+ fi
	164	+
135	165	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
136	166	keepdir $dir2keep \|\| die "failed running keepdir: $dir2keep"
137	167	done
...	...	@@ -140,13 +170,9 @@ src_install() {
140	170	use fam \|\| sed -i -e's\|^.*use famd$\|\|g' ${D}/etc/init.d/courier
141	171
142	172	cd ${D}/etc/courier
	173	+ if ! use nowebmail ; then
143	174	insinto /etc/courier
144	175	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
145		-
146		- if use pam ; then
147		- dodir /etc/pam.d
148		- rm imapd.authpam pop3d.authpam
149		- for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
150	176	fi
151	177
152	178	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
...	...	@@ -199,17 +225,22 @@ src_install() {
199	225	dodoc tcpd/README.couriertls
200	226	mv ${D}/usr/share/courier/htmldoc ${D}/usr/share/doc/${P}/html
201	227
	228	+ if ! use nowebmail ; then
202	229	insinto /usr/$(get_libdir)/courier/courier
203	230	insopts -m 755 -o mail -g mail
204	231	doins ${S}/courier/webmaild
	232	+ fi
205	233
	234	+ if ! use nowebadmin ; then
206	235	insinto /etc/courier/webadmin
207	236	insopts -m 400 -o mail -g mail
208	237	doins ${FILESDIR}/password.dist
	238	+ fi
209	239
210	240	# avoid name collisions in /usr/sbin, make webadmin match
211	241	cd ${D}/usr/sbin
212	242	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
	243	+ if ! use nowebadmin ; then
213	244	sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
214	245	-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
215	246	${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
...	...	@@ -218,6 +249,7 @@ src_install() {
218	249	-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
219	250	${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
220	251	\|\| ewarn "failed to fix webadmin"
	252	+ fi
221	253
222	254	# users should be able to send mail. Could be restricted with suictl.
223	255	chmod u+s ${D}/usr/bin/sendmail