Revision: 7574
http://sourceforge.net/p/ipcop/svn/7574
Author: owes
Date: 2014-05-24 08:32:10 +0000 (Sat, 24 May 2014)
Log Message:
-----------
Add json-c library, requirement for newer rsyslog versions.
Modified Paths:
--------------
ipcop/trunk/make.sh
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
Added Paths:
-----------
ipcop/trunk/config/rootfiles/common/json-c
ipcop/trunk/lfs/json-c
Added: ipcop/trunk/config/rootfiles/common/json-c
===================================================================
--- ipcop/trunk/config/rootfiles/common/json-c (rev 0)
+++ ipcop/trunk/config/rootfiles/common/json-c 2014-05-24 08:32:10 UTC (rev
7574)
@@ -0,0 +1,26 @@
+#usr/include/json
+#usr/include/json-c
+#usr/include/json-c/arraylist.h
+#usr/include/json-c/bits.h
+#usr/include/json-c/debug.h
+#usr/include/json-c/json.h
+#usr/include/json-c/json_c_version.h
+#usr/include/json-c/json_config.h
+#usr/include/json-c/json_inttypes.h
+#usr/include/json-c/json_object.h
+#usr/include/json-c/json_object_iterator.h
+#usr/include/json-c/json_object_private.h
+#usr/include/json-c/json_tokener.h
+#usr/include/json-c/json_util.h
+#usr/include/json-c/linkhash.h
+#usr/include/json-c/printbuf.h
+#usr/lib/libjson-c.la
+#usr/lib/libjson-c.so
+usr/lib/libjson-c.so.2
+usr/lib/libjson-c.so.2.0.1
+#usr/lib/libjson.la
+#usr/lib/libjson.so
+#usr/lib/libjson.so.0
+#usr/lib/libjson.so.0.1.0
+#usr/lib/pkgconfig/json-c.pc
+#usr/lib/pkgconfig/json.pc
Added: ipcop/trunk/lfs/json-c
===================================================================
--- ipcop/trunk/lfs/json-c (rev 0)
+++ ipcop/trunk/lfs/json-c 2014-05-24 08:32:10 UTC (rev 7574)
@@ -0,0 +1,90 @@
+###############################################################################
+# This file is part of the IPCop Firewall. #
+# #
+# IPCop is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPCop is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPCop; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Makefiles are based on LFSMake, which is #
+# Copyright (C) 2002 Rod Roard <[email protected]>
#
+# #
+# Modifications by: #
+# ??-12-2003 Mark Wormgoor < [email protected]> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = json-c
+VER = 0.11
+HOST_ARCH = all
+OTHER_SRC = yes
+
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = https://s3.amazonaws.com/json-c_releases/releases
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = aa02367d2f7a830bf1e3376f77881e98
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && make
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
Property changes on: ipcop/trunk/lfs/json-c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-05-24 07:43:32 UTC (rev 7573)
+++ ipcop/trunk/make.sh 2014-05-24 08:32:10 UTC (rev 7574)
@@ -1800,6 +1800,7 @@
chroot_make module-init-tools
#chroot_make kmod
chroot_make patch
+ chroot_make json-c # required by rsyslog
chroot_make rsyslog
chroot_make strace # compile early for debug purpose
chroot_make sysvinit
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-24 07:43:32 UTC
(rev 7573)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-24 08:32:10 UTC
(rev 7574)
@@ -79,6 +79,10 @@
/bin/egrep
/bin/grep
##
+## json-c-0.11
+/usr/lib/libjson-c.so.2
+/usr/lib/libjson-c.so.2.0.1
+##
## linux-3.4-3 (3.4.91)
/boot/vmlinuz
/boot/vmlinuz-3.4-3
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
