[arch-commits] Commit in rsyslog/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Wednesday, October 1, 2014 @ 12:53:19
  Author: spupykin
Revision: 119951

clean up

Modified:
  rsyslog/trunk/PKGBUILD
Deleted:
  rsyslog/trunk/build-fix.patch

-----------------+
 PKGBUILD        |   11 ++---------
 build-fix.patch |   15 ---------------
 2 files changed, 2 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 10:52:28 UTC (rev 119950)
+++ PKGBUILD	2014-10-01 10:53:19 UTC (rev 119951)
@@ -20,18 +20,11 @@
 options=('strip' 'zipman')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
-	'rsyslog.conf'
-	'build-fix.patch')
+	'rsyslog.conf')
 md5sums=('03a80c3390294205be2df1d3a9d24f8a'
          '0d990373f5c70ddee989296007b4df5b'
-         'd61dd424e660eb16401121eed20d98bc'
-         '1211cde1be4a2196c77d89e38c48c930')
+         'd61dd424e660eb16401121eed20d98bc')
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-#  patch -p1 <$srcdir/build-fix.patch
-}
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2014-10-01 10:52:28 UTC (rev 119950)
+++ build-fix.patch	2014-10-01 10:53:19 UTC (rev 119951)
@@ -1,15 +0,0 @@
-diff -wbBur rsyslog-8.4.0/runtime/msg.c rsyslog-8.4.0.my/runtime/msg.c
---- rsyslog-8.4.0/runtime/msg.c	2014-08-18 13:14:06.000000000 +0400
-+++ rsyslog-8.4.0.my/runtime/msg.c	2014-08-22 15:58:52.974045109 +0400
-@@ -4074,7 +4074,11 @@
- 
- 			err = tokener->err;
- 			if(err != json_tokener_continue)
-+#				if HAVE_JSON_TOKENER_ERROR_DESC
-+					errMsg = json_tokener_error_desc(err);
-+#				else
- 				errMsg = json_tokener_errors[err];
-+#				endif
- 			else
- 				errMsg = "Unterminated input";
- 		} else if(!json_object_is_type(json, json_type_object))