diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2009-11-09 13:23:02 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2009-11-09 13:23:02 +0000 |
| commit | 42a10a6bbee3667623da77a3276226bdae10922d (patch) | |
| tree | ce123488ff9eaa68d9de005851683947e15cc7b5 /app-admin | |
| parent | app-laptop/acerhdf: version bump (diff) | |
| download | sunrise-42a10a6bbee3667623da77a3276226bdae10922d.tar.gz sunrise-42a10a6bbee3667623da77a3276226bdae10922d.tar.bz2 sunrise-42a10a6bbee3667623da77a3276226bdae10922d.zip | |
app-admin/jailkit: updateded autoinclusion of jailkit into /etc/shells, patch provided by Scott(wyrie)
svn path=/sunrise/; revision=9487
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/jailkit/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/jailkit/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/jailkit/files/jailkit-2.10-destdir.patch | 19 | ||||
| -rw-r--r-- | app-admin/jailkit/jailkit-2.10.ebuild | 11 |
4 files changed, 32 insertions, 8 deletions
diff --git a/app-admin/jailkit/ChangeLog b/app-admin/jailkit/ChangeLog index fdf9fb7a1..44ad51f87 100644 --- a/app-admin/jailkit/ChangeLog +++ b/app-admin/jailkit/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> + jailkit-2.10.ebuild, +files/jailkit-2.10-destdir.patch: + updateded autoinclusion of jailkit into /etc/shells, patch provided by + Scott(wyrie) + 05 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> -jailkit-2.3.ebuild, -files/jailkit-2.3-destdir.patch, -files/jailkit-2.3-nostrip.patch, +jailkit-2.10.ebuild, diff --git a/app-admin/jailkit/Manifest b/app-admin/jailkit/Manifest index bbc0e26a5..f9757f612 100644 --- a/app-admin/jailkit/Manifest +++ b/app-admin/jailkit/Manifest @@ -1,7 +1,8 @@ AUX jailkit 277 RMD160 3008e6f78a67af2eb318988c034f58197c54abc1 SHA1 a365679a5c9f80db63c3737f979c5b1c99d8f5d4 SHA256 58a7fcdaae6b1706d0183c826b4ff5856c99f24ba41eaf7956b42ff8e35388a7 +AUX jailkit-2.10-destdir.patch 753 RMD160 1fd6df8f58fbad0c29a870ec6ba7f947348e3f83 SHA1 7199e09693115e161834b41ec6d16a37a9a35699 SHA256 c02cb834162e3b585a43dc4704d7dc59ad7b61528bffe883fe90168362ae3350 AUX jailkit-2.10-ldflags.patch 1885 RMD160 4a1b7bbabb29f9852e9988945ba1047b33443dad SHA1 afbf0aa87f43f881aafc4ee9f6c54c606063d1ad SHA256 a4c32f8ede109b5bdf8b40c32fe18d7c60fef9da9aeb55f86ffae1db0b4bd1a7 AUX jailkit-2.10-pyc.patch 354 RMD160 d0a548409b74ed94fcb9537850ebba96954917b3 SHA1 c55581b9216680aeec54d5e12da4f988052c4777 SHA256 7ec99db35b9483446601495d2ae481df52611e6f52926d3cd18ffbd569a5fd70 DIST jailkit-2.10.tar.bz2 108922 RMD160 2016c231e71aa9f460c53976b2f12ac047fde7f8 SHA1 e68a29e813d44dd0a0627527005e6b6e270008d5 SHA256 bd37cfe9583a7afa0e585698558e0e98757bd66a305c00f93d221c29a5cebe41 -EBUILD jailkit-2.10.ebuild 852 RMD160 ea7a89f9cf8d0b6a0832064424b5a346a0620d83 SHA1 95d9ce80c0aea32370eb297ae49d20340d1249af SHA256 2758f4cc572feb56de240f4c42610bf5b7d02f8e7e6a7cdd2de49097e7a915ab -MISC ChangeLog 1485 RMD160 392cee6338bcd370a6438bdf618847a38de8715a SHA1 1fae8a2fd6dc7b25a39bf2631bb48e3c5e39b3ff SHA256 b312820c01304b8c990ad1da6522c2148cc88cf66b6596d9ef27b2b6b1456f7f +EBUILD jailkit-2.10.ebuild 863 RMD160 edac28e91239c34f6b11ad2bd4c17fef0041e111 SHA1 8e921929085909e3a71c793615fde75b2c2b85b3 SHA256 23db7bbc11af80499ddae173309597acc07b82e9fbf5417528bc5ef9870d4bf7 +MISC ChangeLog 1689 RMD160 b0c351dc3a88d8b54c1ecccde22bcbda29eb7382 SHA1 aa0378cc3f42726d62c5e8cdacd902e127ecf063 SHA256 f7767acf6a720bf8e3304d7ba611e404070c03cc68e595bd0a0fb5a19ab750e0 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/app-admin/jailkit/files/jailkit-2.10-destdir.patch b/app-admin/jailkit/files/jailkit-2.10-destdir.patch new file mode 100644 index 000000000..f39fe2a81 --- /dev/null +++ b/app-admin/jailkit/files/jailkit-2.10-destdir.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile.in b/Makefile.in +index 69a9229..fe888a9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -69,10 +69,10 @@ install: + @cd man/ && $(MAKE) install + # test if the jk_chrootsh is already in /etc/shells + # this previously had @echo but that fails on FreeBSD +- if test -w /etc/shells; then \ +- if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \ +- echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\ +- echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\ ++ if test -w $(DESTDIR)/etc/shells; then \ ++ if ! grep ${prefix}/sbin/jk_chrootsh $(DESTDIR)/etc/shells ; then \ ++ echo "appending ${prefix}/sbin/jk_chroots to $(DESTDIR)/etc/shells";\ ++ echo ${prefix}/sbin/jk_chrootsh >> $(DESTDIR)/etc/shells ;\ + fi \ + fi + diff --git a/app-admin/jailkit/jailkit-2.10.ebuild b/app-admin/jailkit/jailkit-2.10.ebuild index 2a46e698b..61fe01112 100644 --- a/app-admin/jailkit/jailkit-2.10.ebuild +++ b/app-admin/jailkit/jailkit-2.10.ebuild @@ -18,17 +18,16 @@ IUSE="" src_prepare() { epatch \ "${FILESDIR}/${P}-ldflags.patch" \ - "${FILESDIR}/${P}-pyc.patch" + "${FILESDIR}/${P}-pyc.patch" \ + "${FILESDIR}/${P}-destdir.patch" eautoreconf } src_install() { + dodir /etc + cp /etc/shells "${D}"/etc/shells || die emake DESTDIR="${D}" install || die "emake install failed" - doinitd "${FILESDIR}/jailkit" -} - -pkg_postinst() { - elog "Don't forget to add /usr/sbin/jk_chrootsh to /etc/shells." + doinitd "${FILESDIR}/jailkit" || die } pkg_postrm() { |