From aa88ec7e3a2f929e73191907705e668c9d29558c Mon Sep 17 00:00:00 2001 From: "John L. Whiteman" Date: Thu, 14 Aug 2014 14:34:06 -0700 Subject: [PATCH] Fixed the HTTP test code for TWP testing per Samsung report Change-Id: I79597db19b6f86d1454d62e23d7ad82e6db52de9 Signed-off-by: John L. Whiteman --- framework/Makefile | 18 ++++-------- framework/Makefile_TPCSSerDaemon | 17 ++++------- framework/Makefile_TWPSerDaemon | 16 ++++------ framework/Makefile_channel_client | 21 +++----------- framework/Makefile_channel_server | 20 +++---------- packaging/csf-framework.changes | 6 ++++ packaging/csf-framework.manifest | 5 ++++ packaging/csf-framework.spec | 61 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 98 insertions(+), 66 deletions(-) create mode 100644 packaging/csf-framework.changes create mode 100644 packaging/csf-framework.manifest create mode 100644 packaging/csf-framework.spec diff --git a/framework/Makefile b/framework/Makefile index bd3751a..5f15f7c 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -33,7 +33,7 @@ OUTDIR = lib TARGET = $(OUTDIR)/libsecfw.so SRCDIR = . INCLUDE = -I. $(TCS_INC) -I../plugin -LD_FLAGS := $(LD_FLAGS) -ldl +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -ltzplatform-config-1.0 ifeq ($(TCS_CC), ) CC = gcc @@ -83,35 +83,29 @@ SOURCES = $(SRCDIR)/TCSImpl.c $(SRCDIR)/TWPImpl.c OBJECTS = $(OUTDIR)/TCSImpl.o $(OUTDIR)/TWPImpl.o -MKDEP = mkdep -f .depend - - $(OUTDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CFLAGS) $(PKGCFLAGS) -I. -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c -all: $(OUTDIR) .depend $(TARGET) - -.depend: $(SOURCES) - $(MKDEP) $(CFLAGS) $(SOURCES) +all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) +<<<<<<< HEAD $(LD) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKGLD_FLAGS) # $(AR) -cr $(TARGET) $(OBJECTS) $(STRIP) $(TARGET) +======= + $(CC) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) +>>>>>>> Fixed the HTTP test code for TWP testing per Samsung report $(OUTDIR): @mkdir $(OUTDIR) distclean: clean - @rm -f .depend @rm -rf $(OUTDIR) clean: @rm -f $(TARGET) @rm -f $(OBJECTS) *~ @rm -f *.bb *.bbg *.da *.gcov - --include .depend - diff --git a/framework/Makefile_TPCSSerDaemon b/framework/Makefile_TPCSSerDaemon index 7eb3ccf..ed600ba 100755 --- a/framework/Makefile_TPCSSerDaemon +++ b/framework/Makefile_TPCSSerDaemon @@ -32,7 +32,7 @@ OUTDIR = bin TARGET = $(OUTDIR)/TPCSSerDaemon SRCDIR = . -LD_FLAGS := $(LD_FLAGS) -ldl +LD_FLAGS := $(LD_FLAGS) -ldl -ltzplatform-config-1.0 ifeq ($(TCS_CC), ) CC = gcc @@ -79,22 +79,21 @@ SOURCES = $(SRCDIR)/TPCSSerDaemon.c \ OBJECTS = $(OUTDIR)/TPCSSerDaemon.o \ $(OUTDIR)/IpcForkDaemon.o -MKDEP = mkdep -f .depend - $(OUTDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c -all: $(OUTDIR) .depend $(TARGET) - -.depend: $(SOURCES) - $(MKDEP) $(CFLAGS) $(SOURCES) +all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) +<<<<<<< HEAD $(LD) -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKG_LDFLAGS) # $(AR) -cr $(TARGET) $(OBJECTS) # $(STRIP) $(TARGET) +======= + $(CC) -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) +>>>>>>> Fixed the HTTP test code for TWP testing per Samsung report $(OUTDIR): @mkdir $(OUTDIR) @@ -104,13 +103,9 @@ install: all cp ${TARGET} ${DESTDIR}/bin/ distclean: clean - @rm -f .depend @rm -rf $(OUTDIR) clean: @rm -f $(TARGET) @rm -f $(OBJECTS) *~ @rm -f *.bb *.bbg *.da *.gcov - --include .depend - diff --git a/framework/Makefile_TWPSerDaemon b/framework/Makefile_TWPSerDaemon index aacfd07..180f986 100644 --- a/framework/Makefile_TWPSerDaemon +++ b/framework/Makefile_TWPSerDaemon @@ -33,7 +33,7 @@ OUTDIR = bin TARGET = $(OUTDIR)/TWPSerDaemon SRCDIR = . INCLUDE = -I. $(TCS_INC) -I../plugin -LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -lsecfw -lscserver -lpthread -lm -Llib +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -lsecfw -lscserver -lm -Llib -ltzplatform-config-1.0 ifeq ($(TCS_CC), ) CC = gcc @@ -70,8 +70,6 @@ SOURCES = $(SRCDIR)/TWPSerDaemon.c \ OBJECTS = $(OUTDIR)/TWPSerDaemon.o \ $(OUTDIR)/IpcForkDaemon.o -MKDEP = mkdep -f .depend - # Define a list of pkg-config packages we want to use ifeq ($(TCS_CFG), release) pkg_packages = dbus-glib-1 @@ -91,25 +89,23 @@ PKGCFLAGS += -Wall -I$(SRCDIR) $(PKCL_CFLAGS) $(GBS_CFLAGS) $(PKG_CFLAGS) $(OUTDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CFLAGS) $(PKGCFLAGS) -I. -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c -all: $(OUTDIR) .depend $(TARGET) - -.depend: $(SOURCES) - $(MKDEP) $(CFLAGS) $(SOURCES) +all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) - $(LD) -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKGLD_FLAGS) -# $(STRIP) $(TARGET) + $(CC) -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKGLD_FLAGS) $(OUTDIR): @mkdir $(OUTDIR) distclean: clean - @rm -f .depend @rm -rf $(OUTDIR) clean: @rm -f $(TARGET) @rm -f $(OBJECTS) *~ @rm -f *.bb *.bbg *.da *.gcov +<<<<<<< HEAD -include .depend +======= +>>>>>>> Fixed the HTTP test code for TWP testing per Samsung report diff --git a/framework/Makefile_channel_client b/framework/Makefile_channel_client index b16c902..eb2bf36 100644 --- a/framework/Makefile_channel_client +++ b/framework/Makefile_channel_client @@ -32,7 +32,7 @@ OUTDIR = lib TARGET = $(OUTDIR)/libscclient.so SRCDIR = . -LD_FLAGS := $(LD_FLAGS) -ldl +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -ltzplatform-config-1.0 ifeq ($(TCS_CC), ) CC = gcc @@ -84,22 +84,13 @@ SOURCES = $(SRCDIR)/IpcClient.c \ OBJECTS = $(OUTDIR)/IpcClient.o \ $(OUTDIR)/IpcStructs.o -MKDEP = mkdep -f .depend - $(OUTDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c -all: $(OUTDIR) .depend $(TARGET) - -.depend: $(SOURCES) - $(MKDEP) $(CFLAGS) $(SOURCES) +all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) - $(LD) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) - -# $(AR) -cr $(TARGET) $(OBJECTS) - - $(STRIP) $(TARGET) + $(CC) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(OUTDIR): @mkdir $(OUTDIR) @@ -109,13 +100,9 @@ install: all cp ${TARGET} ${DESTDIR}/bin/ distclean: clean - @rm -f .depend -# @rm -rf $(OUTDIR) + @rm -rf $(OUTDIR) clean: @rm -f $(TARGET) @rm -f $(OBJECTS) *~ @rm -f *.bb *.bbg *.da *.gcov - --include .depend - diff --git a/framework/Makefile_channel_server b/framework/Makefile_channel_server index 286be2d..eabf440 100644 --- a/framework/Makefile_channel_server +++ b/framework/Makefile_channel_server @@ -32,7 +32,7 @@ OUTDIR = lib TARGET = $(OUTDIR)/libscserver.so SRCDIR = . -LD_FLAGS := $(LD_FLAGS) -ldl +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -ltzplatform-config-1.0 ifeq ($(TCS_CC), ) CC = gcc @@ -85,22 +85,13 @@ OBJECTS = $(OUTDIR)/IpcServer.o \ $(OUTDIR)/IpcServerError.o \ $(OUTDIR)/IpcThrdPool.o -MKDEP = mkdep -f .depend - $(OUTDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c -all: $(OUTDIR) .depend $(TARGET) - -.depend: $(SOURCES) - $(MKDEP) $(CFLAGS) $(SOURCES) +all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) - $(LD) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) - -# $(AR) -cr $(TARGET) $(OBJECTS) - -# $(STRIP) $(TARGET) + $(CC) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(OUTDIR): @mkdir $(OUTDIR) @@ -110,12 +101,9 @@ install: all cp ${TARGET} ${DESTDIR}/bin/ distclean: clean - @rm -f .depend -# @rm -rf $(OUTDIR) + @rm -rf $(OUTDIR) clean: @rm -f $(TARGET) @rm -f $(OBJECTS) *~ @rm -f *.bb *.bbg *.da *.gcov - --include .depend diff --git a/packaging/csf-framework.changes b/packaging/csf-framework.changes new file mode 100644 index 0000000..fa501cc --- /dev/null +++ b/packaging/csf-framework.changes @@ -0,0 +1,6 @@ +* Thu Aug 14 2014 John L. Whiteman upstream/2.0.2-1-gf74ac25 +- Fixed the HTTP test code for TWP testing per Samsung report + +* Thu Aug 07 2014 John L. Whiteman upstream/2.0.1-1-g2af60fc +- Initial commit of Content Security Framework (CSF) + diff --git a/packaging/csf-framework.manifest b/packaging/csf-framework.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/csf-framework.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/csf-framework.spec b/packaging/csf-framework.spec new file mode 100644 index 0000000..0e631d1 --- /dev/null +++ b/packaging/csf-framework.spec @@ -0,0 +1,61 @@ +Summary: Content Security Framework +Name: csf-framework +Version: 2.0.2 +Release: 0 +License: BSD-3-Clause +Group: Security/Libraries +URL: http://tizen.org +Source: %{name}-%{version}.tar.gz +Source1001: csf-framework.manifest +BuildRequires: pkgconfig(libtzplatform-config) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(libxml-2.0) + +%description +A general purpose content screening and reputation solution. + +%prep +%setup -q +cp %{SOURCE1001} . + +%build +cd framework + +# Build Framework Library +make -f Makefile all + +# Build IPC Client Library +make -f Makefile_channel_client all + +# Build IPC Server Library +make -f Makefile_channel_server all + +# Build Plugin Control Service +make -f Makefile_TPCSSerDaemon all + +# Build Web Protection Control Service +make -f Makefile_TWPSerDaemon all + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_libdir}/ +mkdir -p %{buildroot}%{_bindir}/ +install -D framework/lib/libsecfw.so %{buildroot}%{_libdir}/ +install -D framework/lib/libscclient.so %{buildroot}%{_libdir}/ +install -D framework/lib/libscserver.so %{buildroot}%{_libdir}/ +install -D framework/bin/TPCSSerDaemon %{buildroot}%{_bindir}/ +install -D framework/bin/TWPSerDaemon %{buildroot}%{_bindir}/ + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%manifest %{name}.manifest +%defattr(-,root,root,-) +%{_libdir}/libsecfw.so +%{_libdir}/libscclient.so +%{_libdir}/libscserver.so +%attr(755,root,root) %{_bindir}/TPCSSerDaemon +%attr(755,root,root) %{_bindir}/TWPSerDaemon -- 2.7.4