[SCM] pd-iemnet/master: Fixed hardening patch

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d2963224385cf5dc52028767a9f39e8dbe1629f6
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 25 22:06:27 2012 +0200

    Fixed hardening patch

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index d04195d..cdcd865 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,79 +1,16 @@
 Author: IOhannes m zmölnig
 Description: use *FLAGS from outside to enable hardening
-Last-Update: 2012-06-14
+Last-Update: 2012-06-25
 --- pd-iemnet.orig/Makefile
 +++ pd-iemnet/Makefile
-@@ -11,12 +11,12 @@
- 
- # For objects that only build on certain platforms, add those to the SOURCES
- # line for the right platforms.
--SOURCES_android = 
--SOURCES_cygwin = 
--SOURCES_macosx = 
--SOURCES_iphoneos = 
--SOURCES_linux = 
--SOURCES_windows = 
-+SOURCES_android =
-+SOURCES_cygwin =
-+SOURCES_macosx =
-+SOURCES_iphoneos =
-+SOURCES_linux =
-+SOURCES_windows =
- 
- # .c source files that will be statically linked to _all_ objects
- HELPERSOURCES = iemnet.c iemnet_data.c  iemnet_receiver.c  iemnet_sender.c
-@@ -24,12 +24,12 @@
- 
- # list all pd objects (i.e. myobject.pd) files here, and their helpfiles will
- # be included automatically
--PDOBJECTS = 
-+PDOBJECTS =
- 
- # if you want to include any other files in the source and binary tarballs,
- # list them here.  This can be anything from header files, READMEs, example
- # patches, documentation, etc.
--EXTRA_DIST = 
-+EXTRA_DIST =
- 
- # to enable debugging set this to "-DDEBUG"
- # you can slo just run make as "make DEBUG_CFLAGS='-DDEBUG'"
-@@ -56,9 +56,9 @@
+@@ -56,8 +56,8 @@
  INSTALL_LIB     = $(INSTALL) -p -m 644 -s
  INSTALL_DIR     = $(INSTALL) -p -m 755 -d
  
 -CFLAGS = -DPD -DLIBRARY_VERSION=\"$(LIBRARY_VERSION)\" -I$(PD_PATH)/src -Wall -W -Wno-unused -g 
 -LDFLAGS =  
--LIBS = 
-+CFLAGS += $(CPPFLAGS) -DPD -DLIBRARY_VERSION=\"$(LIBRARY_VERSION)\" -I$(PD_PATH)/src -Wall -W -Wno-unused -g
-+LDFLAGS +=
-+LIBS =
++CFLAGS += $(CPPFLAGS) -DPD -DLIBRARY_VERSION=\"$(LIBRARY_VERSION)\" -I$(PD_PATH)/src -Wall -W -Wno-unused -g 
++LDFLAGS +=  
+ LIBS = 
  ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \
  	         $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows)
- 
-@@ -79,7 +79,7 @@
- 	CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) \
-       -I/Applications/Pd-extended.app/Contents/Resources/include
-     LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT)
--    LIBS += -lc 
-+    LIBS += -lc
-     STRIP = strip -x
-     DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
-     DISTBINDIR=$(DISTDIR)-$(OS)
-@@ -92,7 +92,7 @@
-     CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \
-       -I/Applications/Pd-extended.app/Contents/Resources/include
-     LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
--    LIBS += -lc 
-+    LIBS += -lc
-     STRIP = strip -x
-     DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
-     DISTBINDIR=$(DISTDIR)-$(OS)
-@@ -143,7 +143,7 @@
-   EXTENSION = dll
-   OS = cygwin
-   OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
--  CFLAGS += 
-+  CFLAGS +=
-   LDFLAGS += -Wl,--export-dynamic -shared -L$(PD_PATH)/src
-   LIBS += -lc -lpd
-   STRIP = strip --strip-unneeded -R .note -R .comment

-- 
pd-iemnet packaging