diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-07 10:45:25 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-07 10:45:25 +0000 |
| commit | 7d74ae2a5f3b3ef4d2fa0b1ddafef0ede4cebd35 (patch) | |
| tree | 710de9b9c802a779ee682a1132b94f4cb6a754fa /sys-fs/encfs | |
| parent | Fix building with GLIBC 2.10+ wrt #277672. (diff) | |
| download | historical-7d74ae2a5f3b3ef4d2fa0b1ddafef0ede4cebd35.tar.gz historical-7d74ae2a5f3b3ef4d2fa0b1ddafef0ede4cebd35.tar.bz2 historical-7d74ae2a5f3b3ef4d2fa0b1ddafef0ede4cebd35.zip | |
Fix building with GLIBC 2.10+ wrt #277237, thanks to Martin Väth for patch.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/encfs')
| -rw-r--r-- | sys-fs/encfs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/encfs/Manifest | 5 | ||||
| -rw-r--r-- | sys-fs/encfs/encfs-1.5.ebuild | 5 | ||||
| -rw-r--r-- | sys-fs/encfs/files/encfs-1.5-glibc-2.10.patch | 11 |
4 files changed, 23 insertions, 5 deletions
diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog index 1f09934a2a95..bd3fe6242a98 100644 --- a/sys-fs/encfs/ChangeLog +++ b/sys-fs/encfs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/encfs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.40 2009/03/16 08:20:17 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.41 2009/08/07 10:45:25 ssuominen Exp $ + + 07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> encfs-1.5.ebuild, + +files/encfs-1.5-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #277237, thanks to Martin Väth for + patch. 16 Mar 2009; Tiziano Müller <dev-zero@gentoo.org> files/encfs-1.5-boost-system-and-as-needed.patch: diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index 73eeb7f1ce9f..b34958d21444 100644 --- a/sys-fs/encfs/Manifest +++ b/sys-fs/encfs/Manifest @@ -1,7 +1,8 @@ AUX encfs-1.3.2.1-gcc-4.3.patch 6126 RMD160 6a5d61cc965f57f3baf5a2fc1dec0bf7f30187b4 SHA1 f757a6f768e1624ea3d7b6b40445857d0990220c SHA256 f5cb234c916810ef8a89e42b77397e08c528c49825120a3e873ed12e0f3a61e2 AUX encfs-1.4.2-gcc-4.3.patch 3177 RMD160 386e547078e2e1304e6e84d14c243ad6c89b2ee1 SHA1 dbf9d60b41ce79edbc96ca301cb1a6c6c5353fc5 SHA256 f957d533b8f6096f05fd1a1c3be48b884c45070f02a41685307fe195ec3c1e6d AUX encfs-1.5-boost-system-and-as-needed.patch 781 RMD160 4041ab0466c0fdcbbf03551c1d14341db278a982 SHA1 d491b400591f5ca13e658146a1e40517625dc645 SHA256 718fe09fc1400f0f4c281d22dbc11994f3b34836a3251a28a220f36163b2653b +AUX encfs-1.5-glibc-2.10.patch 299 RMD160 2fc786bee544b2a891e5ee283b5da7f2016bb815 SHA1 45c2b4c1ceaa81edcb6a3c8e4a68ae12972a8a17 SHA256 ff1bc08e051d2eb5af3ae43e691902a45abc0d0c39803e31496cb78b68f44301 DIST encfs-1.5-2.tgz 923047 RMD160 c773312e20fa5cb155e0e630cb17afa7c525905f SHA1 7fe225855645d98a33bf9f5fe64ac508fdb75257 SHA256 d3961fa5a83bb2c3242ae579e29aa9f73db1e6969a6b5be66acd952b2f9be112 -EBUILD encfs-1.5.ebuild 1095 RMD160 b2aa778e4f6262cbc1fe286301886ca95a6d7d61 SHA1 dbe853a9a1e888883f4da830f9fee8861cb800fa SHA256 7aed3157a7752a30ac00c0fecfa0a1b9fbb067cbea100878c81f798907a2f444 -MISC ChangeLog 7006 RMD160 6ac8435ed25ec54e1bf98bafa2179ab45592887e SHA1 a6cdd82f9edd3ad40a7ad658f11d622f627c2d0d SHA256 d5235a648c713de0ce13f856e89532f7d98202f6766323b9d6fa2e658275cd51 +EBUILD encfs-1.5.ebuild 1138 RMD160 91f59f754be1ec47a6c605a954a69be375a07373 SHA1 891d473b6ccea2f14763771763a081c28ea802ae SHA256 aba26a2620db6c97d2e22f13abf8e9e5e9559bfb702a9ccab115f8dee5745df6 +MISC ChangeLog 7198 RMD160 d856497889a31da6385854cf4a19cd534ae76055 SHA1 9f1281d19cd7ba4c7c17dcf8accca7fe1947ec9f SHA256 1a6121d67d95f0e112459c57f4a0632dc568b97194680ef9999590dc2788fe04 MISC metadata.xml 262 RMD160 f3d8d0dd73230dfdca175ef66a091c78e44d0f98 SHA1 f08c61f42ce181c625ddaf232ba6e2c86af06250 SHA256 d90fbcb5c6704d3d97dc2cceb80fee7acde549638a4f0270b0d87f64fcee82fa diff --git a/sys-fs/encfs/encfs-1.5.ebuild b/sys-fs/encfs/encfs-1.5.ebuild index 18cc8834a036..4052a547d889 100644 --- a/sys-fs/encfs/encfs-1.5.ebuild +++ b/sys-fs/encfs/encfs-1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.5.ebuild,v 1.5 2008/12/13 16:50:32 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.5.ebuild,v 1.6 2009/08/07 10:45:25 ssuominen Exp $ WANT_AUTOMAKE="1.10" @@ -27,6 +27,7 @@ src_unpack() { cd "${S}" # bug 245782 - sys-fs/encfs-1.5 fails to build with --as-needed epatch "${FILESDIR}"/${P}-boost-system-and-as-needed.patch + epatch "${FILESDIR}"/${P}-glibc-2.10.patch eautomake } diff --git a/sys-fs/encfs/files/encfs-1.5-glibc-2.10.patch b/sys-fs/encfs/files/encfs-1.5-glibc-2.10.patch new file mode 100644 index 000000000000..f42cbe6ed27d --- /dev/null +++ b/sys-fs/encfs/files/encfs-1.5-glibc-2.10.patch @@ -0,0 +1,11 @@ +--- encfs/NameIO.cpp ++++ encfs/NameIO.cpp +@@ -190,7 +190,7 @@ + } else + { + bool isDotFile = (*path == '.'); +- char *next = strchr( path, '/' ); ++ const char *next = strchr( path, '/' ); + int len = next ? next - path : strlen( path ); + + // at this point we know that len > 0 |