diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2009-11-09 16:30:10 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2009-11-09 16:30:10 +0000 |
| commit | 69691ca7b6aca8a3984e5a67cba94391e3628061 (patch) | |
| tree | 7917683b897b848356d23061dc7480d01e82542e /app-admin | |
| parent | app-admin/jailkit: revert commit 9463 (diff) | |
| download | sunrise-69691ca7b6aca8a3984e5a67cba94391e3628061.tar.gz sunrise-69691ca7b6aca8a3984e5a67cba94391e3628061.tar.bz2 sunrise-69691ca7b6aca8a3984e5a67cba94391e3628061.zip | |
app-admin/jailkit: Fixed commit 9463
svn path=/sunrise/; revision=9492
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/jailkit/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/jailkit/files/jailkit-2.10-noshells.patch (renamed from app-admin/jailkit/files/jailkit-2.10-destdir.patch) | 14 | ||||
| -rw-r--r-- | app-admin/jailkit/jailkit-2.10.ebuild | 8 |
3 files changed, 14 insertions, 12 deletions
diff --git a/app-admin/jailkit/Manifest b/app-admin/jailkit/Manifest index 3cbeafae9..dd8ba3d43 100644 --- a/app-admin/jailkit/Manifest +++ b/app-admin/jailkit/Manifest @@ -1,8 +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-noshells.patch 514 RMD160 5583bcdfb602d6f682db2e125bde2507fd2ebb1a SHA1 4c6c722093ae6d7616269ff48ed402db06533b57 SHA256 1dac48a765603f506e1cc0a0d876fb32ed5121cb64cf12dd5ffec31136880ae3 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 +EBUILD jailkit-2.10.ebuild 1008 RMD160 198fce872d46ae2b5c30c909bc19c92ed5d27e2f SHA1 caff6bd8925e91f039eee8f54ae4ee23d4bd04d4 SHA256 98368ccde604fff98b5652bcbaa1d8239dc58cccaf185e1030ae9d1fec092a03 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-noshells.patch index f39fe2a81..ff8359189 100644 --- a/app-admin/jailkit/files/jailkit-2.10-destdir.patch +++ b/app-admin/jailkit/files/jailkit-2.10-noshells.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.in b/Makefile.in -index 69a9229..fe888a9 100644 +index 69a9229..eccdbf4 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -69,10 +69,10 @@ install: +@@ -69,12 +69,6 @@ install: @cd man/ && $(MAKE) install # test if the jk_chrootsh is already in /etc/shells # this previously had @echo but that fails on FreeBSD @@ -10,10 +10,8 @@ index 69a9229..fe888a9 100644 - 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 +- fi \ +- fi + + uninstall: diff --git a/app-admin/jailkit/jailkit-2.10.ebuild b/app-admin/jailkit/jailkit-2.10.ebuild index 2a46e698b..8181a997e 100644 --- a/app-admin/jailkit/jailkit-2.10.ebuild +++ b/app-admin/jailkit/jailkit-2.10.ebuild @@ -18,7 +18,8 @@ IUSE="" src_prepare() { epatch \ "${FILESDIR}/${P}-ldflags.patch" \ - "${FILESDIR}/${P}-pyc.patch" + "${FILESDIR}/${P}-pyc.patch" \ + "${FILESDIR}/${P}-noshells.patch" eautoreconf } @@ -28,7 +29,10 @@ src_install() { } pkg_postinst() { - elog "Don't forget to add /usr/sbin/jk_chrootsh to /etc/shells." + ebegin "Updating /etc/shells" + ( grep -v "^/usr/sbin/jk_chroots$" "${ROOT}"etc/shells; echo "/usr/sbin/jk_chroots" ) > "${T}"/shells + mv -f "${T}"/shells "${ROOT}"etc/shells + eend $? } pkg_postrm() { |