diff --git a/email2trac-2.6.2-installperms.patch b/email2trac-2.6.2-installperms.patch deleted file mode 100644 index 4db3a60..0000000 --- a/email2trac-2.6.2-installperms.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up email2trac-2.6.2/Makefile.in.orig email2trac-2.6.2/Makefile.in ---- email2trac-2.6.2/Makefile.in.orig 2010-03-24 11:09:47.000000000 +0100 -+++ email2trac-2.6.2/Makefile.in 2013-03-11 20:42:43.055175533 +0100 -@@ -37,15 +37,15 @@ install: all install-conf - for script in $(PYTHON_FILES) ; \ - do \ - name=`basename $$script '.py'` ;\ -- $(INSTALL) -m 755 -o $(INSTALL_USER) $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ -+ $(INSTALL) -m 755 $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ - done - -- $(INSTALL) -m 4111 -o $(INSTALL_USER) run_email2trac $(DESTDIR)$(EXEC_PREFIX) -+ $(INSTALL) -m 755 run_email2trac $(DESTDIR)$(EXEC_PREFIX) - - install-conf: - if [ ! -f $(DESTDIR)/$(CONFIG)/email2trac.conf ] ; \ - then \ -- $(INSTALL) -c -m 644 -o $(INSTALL_USER) email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ -+ $(INSTALL) -c -m 644 email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ - fi - - clean: diff --git a/email2trac-2.8.0-format-security.patch b/email2trac-2.8.0-format-security.patch new file mode 100644 index 0000000..302985e --- /dev/null +++ b/email2trac-2.8.0-format-security.patch @@ -0,0 +1,12 @@ +diff -up email2trac-2.8.0/run_email2trac.c.format-security email2trac-2.8.0/run_email2trac.c +--- email2trac-2.8.0/run_email2trac.c.format-security 2014-01-14 13:26:24.000000000 +0100 ++++ email2trac-2.8.0/run_email2trac.c 2014-04-19 12:26:13.531840470 +0200 +@@ -56,7 +56,7 @@ void check_username(char *name) + void email2trac_log(char *message) + { + openlog("run_email2trac", LOG_PID, LOG_MAIL); +- syslog(LOG_ERR, message); ++ syslog(LOG_ERR, "%s", message); + closelog(); + } + diff --git a/email2trac-2.8.0-installperms.patch b/email2trac-2.8.0-installperms.patch new file mode 100644 index 0000000..e41149e --- /dev/null +++ b/email2trac-2.8.0-installperms.patch @@ -0,0 +1,22 @@ +diff -up email2trac-2.8.0/Makefile.in.installperms email2trac-2.8.0/Makefile.in +--- email2trac-2.8.0/Makefile.in.installperms 2010-03-24 11:09:47.000000000 +0100 ++++ email2trac-2.8.0/Makefile.in 2014-04-19 12:27:53.791343007 +0200 +@@ -37,15 +37,15 @@ install: all install-conf + for script in $(PYTHON_FILES) ; \ + do \ + name=`basename $$script '.py'` ;\ +- $(INSTALL) -m 755 -o $(INSTALL_USER) $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ ++ $(INSTALL) -m 755 $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ + done + +- $(INSTALL) -m 4111 -o $(INSTALL_USER) run_email2trac $(DESTDIR)$(EXEC_PREFIX) ++ $(INSTALL) -m 755 run_email2trac $(DESTDIR)$(EXEC_PREFIX) + + install-conf: + if [ ! -f $(DESTDIR)/$(CONFIG)/email2trac.conf ] ; \ + then \ +- $(INSTALL) -c -m 644 -o $(INSTALL_USER) email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ ++ $(INSTALL) -c -m 644 email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ + fi + + clean: diff --git a/email2trac.spec b/email2trac.spec index e3eb98d..83c739e 100644 --- a/email2trac.spec +++ b/email2trac.spec @@ -10,7 +10,9 @@ URL: https://oss.trac.surfsara.nl/email2trac Source0: ftp://ftp.sara.nl/pub/outgoing/email2trac-%{version}.tar.gz BuildRequires: python Requires: trac -Patch0: email2trac-2.6.2-installperms.patch +Patch0: email2trac-2.8.0-installperms.patch +# see https://oss.trac.surfsara.nl/email2trac/ticket/341 +Patch1: email2trac-2.8.0-format-security.patch %description This is a release of the SARA package email2trac that contains @@ -32,7 +34,8 @@ extend the initial setup, with the following extensions: %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .installperms +%patch1 -p1 -b .format-security %build @@ -55,6 +58,7 @@ make install DESTDIR=%{buildroot} %changelog * Sat Apr 19 2014 Thomas Moschny - 2.8.0-1 - Update to 2.8.0. +- Add patch to fix format-security error. * Sat Aug 03 2013 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild