[pen] Add a patch for gcc format security check enabled since F21.

Christopher Meng cicku at fedoraproject.org
Wed Apr 2 09:52:42 UTC 2014


commit bdc430bdecdddc50d0ce19201e342e9cd361b780
Author: Christopher Meng <i at cicku.me>
Date:   Wed Apr 2 17:25:59 2014 +0800

    Add a patch for gcc format security check enabled since F21.

 pen-0.22.0-gcc-format-security-fix.patch |   24 ++++++++++++++++++++++++
 pen.spec                                 |    2 ++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/pen-0.22.0-gcc-format-security-fix.patch b/pen-0.22.0-gcc-format-security-fix.patch
new file mode 100644
index 0000000..a030e92
--- /dev/null
+++ b/pen-0.22.0-gcc-format-security-fix.patch
@@ -0,0 +1,24 @@
+diff -uN pen-0.22.0.orig/pen.c pen-0.22.0/pen.c
+--- pen-0.22.0.orig/pen.c	2014-04-02 16:31:37.190717955 +0800
++++ pen-0.22.0/pen.c	2014-04-02 17:14:49.591585697 +0800
+@@ -2155,7 +2155,7 @@
+ 	remove(a);
+ 	memset(&serv_addr, 0, sizeof serv_addr);
+ 	serv_addr.sun_family = AF_UNIX;
+-	snprintf(serv_addr.sun_path, sizeof serv_addr.sun_path, a);
++	snprintf("%s", serv_addr.sun_path, sizeof serv_addr.sun_path, a);
+ 	if ((listenfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
+ 		error("can't open stream socket");
+ 	}
+diff -uN pen-0.22.0.orig/penctl.c pen-0.22.0/penctl.c
+--- pen-0.22.0.orig/penctl.c	2014-04-02 16:31:37.188717957 +0800
++++ pen-0.22.0/penctl.c	2014-04-02 17:13:55.560620603 +0800
+@@ -77,7 +77,7 @@
+ 	if (fd < 0) error("error opening socket");
+ 	memset(&serv_addr, 0, sizeof serv_addr);
+ 	serv_addr.sun_family = AF_UNIX;
+-	snprintf(serv_addr.sun_path, sizeof serv_addr.sun_path, path);
++	snprintf("%s", serv_addr.sun_path, sizeof serv_addr.sun_path, path);
+ 	n = connect(fd, (struct sockaddr *)&serv_addr, sizeof serv_addr);
+ 	if (n == -1) {
+ 		error("error connecting to server");
diff --git a/pen.spec b/pen.spec
index 277c2f0..cd4256d 100644
--- a/pen.spec
+++ b/pen.spec
@@ -6,6 +6,7 @@ License:        GPLv2
 URL:            http://siag.nu/pen/
 Source0:        http://siag.nu/pub/pen/%{name}-%{version}.tar.gz
 Source1:        pen.httpd
+Patch0:         pen-0.22.0-gcc-format-security-fix.patch
 BuildRequires:  GeoIP-devel
 BuildRequires:  openssl-devel
 Requires:       httpd
@@ -18,6 +19,7 @@ available servers. This gives high availability and scalable performance.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Convert to utf-8
 for file in ChangeLog penctl.1; do


More information about the scm-commits mailing list