diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2009-03-01 23:59:39 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2009-03-01 23:59:39 +0000 |
| commit | 667b4123411ab6972b1b6ca1222893e3a2fe30e5 (patch) | |
| tree | 371f1605c10a2b53e7a1aa8da5f89766cb9febb1 /app-admin | |
| parent | Bump to 1.5. Removed doc useflag as the docs aren't in the tarball anymore. F... (diff) | |
| download | gentoo-2-667b4123411ab6972b1b6ca1222893e3a2fe30e5.tar.gz gentoo-2-667b4123411ab6972b1b6ca1222893e3a2fe30e5.tar.bz2 gentoo-2-667b4123411ab6972b1b6ca1222893e3a2fe30e5.zip | |
Fix for gcc 4.3.3 / fortify_sources. Patch by Magnus Granberg.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/watchfolder/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/watchfolder/files/0.3.3-fortify-sources.patch | 11 | ||||
| -rw-r--r-- | app-admin/watchfolder/watchfolder-0.3.3.ebuild | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/app-admin/watchfolder/ChangeLog b/app-admin/watchfolder/ChangeLog index d37d402f887c..e33553f1bbb0 100644 --- a/app-admin/watchfolder/ChangeLog +++ b/app-admin/watchfolder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/watchfolder # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/ChangeLog,v 1.13 2009/01/03 17:27:52 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/ChangeLog,v 1.14 2009/03/01 23:59:39 patrick Exp $ + + 01 Mar 2009; Patrick Lauer <patrick@gentoo.org> + +files/0.3.3-fortify-sources.patch, watchfolder-0.3.3.ebuild: + Fix for gcc 4.3.3 / fortify_sources. Patch by Magnus Granberg. 03 Jan 2009; Christoph Mende <angelos@gentoo.org> -watchfolder-0.3.1.1.ebuild, watchfolder-0.3.3.ebuild: diff --git a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch new file mode 100644 index 000000000000..c9e47038612f --- /dev/null +++ b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch @@ -0,0 +1,11 @@ +--- watchd.c 2009-02-27 23:46:42.000000000 +0000 ++++ watchd.c 2009-02-27 23:50:22.000000000 +0000 +@@ -671,7 +671,7 @@ + { + if (folder->flags&FL_LOG_FILE) + { +- log=open(curfolder->logfile, O_CREAT | O_WRONLY | O_APPEND ); ++ log=open(curfolder->logfile, O_CREAT | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR ); + if (log>0) + { + lseek(fd, SEEK_SET, 0); // Rewind temp log file.. diff --git a/app-admin/watchfolder/watchfolder-0.3.3.ebuild b/app-admin/watchfolder/watchfolder-0.3.3.ebuild index 205806718a32..6a1784047a81 100644 --- a/app-admin/watchfolder/watchfolder-0.3.3.ebuild +++ b/app-admin/watchfolder/watchfolder-0.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.3.ebuild,v 1.7 2009/01/03 17:27:52 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.3.ebuild,v 1.8 2009/03/01 23:59:39 patrick Exp $ inherit eutils toolchain-funcs @@ -22,6 +22,8 @@ src_unpack() { # patch to remove warnings on 64 bit systems epatch "${FILESDIR}"/${PV}-64bit.patch || die + # and a gcc 4.3.3 / fortify_sources fix + epatch "${FILESDIR}"/${PV}-fortify-sources.patch || die sed -i \ -e '/-c -o/s:OPT:CFLAGS:' \ |