Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25458
Modified Files:
dpkg.info dpkg.patch
Log Message:
Enabled buildflags.conf, fix so that --disable-nls will build, and added
hardening flags thanks to gecko2
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dpkg.patch 28 May 2013 14:34:15 -0000 1.19
+++ dpkg.patch 23 Jun 2013 14:17:33 -0000 1.20
@@ -1,3 +1,37 @@
+diff -ruN dpkg-1.16.10.orig/fink/buildflags.conf
dpkg-1.16.10/fink/buildflags.conf
+--- dpkg-1.16.10.orig/fink/buildflags.conf 1969-12-31 17:00:00.000000000
-0700
++++ dpkg-1.16.10/fink/buildflags.conf 2013-06-22 20:26:06.000000000 -0600
+@@ -0,0 +1,30 @@
++# defaults
++APPEND CFLAGS -g -O2
++APPEND CXXFLAGS -g -O2
++APPEND FFLAGS -g -O2
++
++# debian stackprotector
++APPEND CFLAGS -fstack-protector
++APPEND CXXFLAGS -fstack-protector
++
++# debian pie
++APPEND CFLAGS -fPIE
++APPEND CXXFLAGS -fPIE
++APPEND LDFLAGS -fPIE -Wl,-pie
++
++# debian relro
++APPEND LDFLAGS -Wl,-read_only_stubs
++
++# debian bindnow
++APPEND LDFLAGS -Wl,-bind_at_load
++
++# debian fortify
++APPEND CPPFLAGS -D_FORTIFY_SOURCE=2
++
++# debian format
++PREPEND CFLAGS -Wformat -Werror=format-security
++PREPEND CXXFLAGS -Wformat -Werror=format-security
++
++# fink defaults
++PREPEND CPPFLAGS -I@FINKPREFIX@/include
++PREPEND LDFLAGS -L@FINKPREFIX@/lib
diff -ruN dpkg-1.16.10.orig/fink/md5sum dpkg-1.16.10/fink/md5sum
--- dpkg-1.16.10.orig/fink/md5sum 1969-12-31 17:00:00.000000000 -0700
+++ dpkg-1.16.10/fink/md5sum 2013-05-28 08:30:00.000000000 -0600
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- dpkg.info 23 Jun 2013 01:56:20 -0000 1.44
+++ dpkg.info 23 Jun 2013 14:17:33 -0000 1.45
@@ -36,7 +36,7 @@
Source-MD5: a20a06a5272717274a8b009368f237da
PatchFile: dpkg.patch
-PatchFile-MD5: 30d353628371c0eb464812cf25384122
+PatchFile-MD5: a851cfe5976cffc3efe6c044d1c88578
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -82,6 +82,9 @@
# Fix for gnutar
perl -pi -e 's,\"tar\",\"%p/bin/gnutar\",g' dpkg-deb/build.c
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c
+# Fix for --disable-nls
+perl -pi -e 's,defined\(__GNUG__\),defined(__NOTGNUG__),g' lib/compat/gettext.h
+
# Fix for older gcc ie: 10.5
perl -pi -e 's,-Wvla ,,g' configure
@@ -91,13 +94,14 @@
perl -pi -e 's,localedir = \@localedir\@,localedir = \@localedir\@-perl,g'
scripts/Makefile.in scripts/po/Makefile.in.in
<<
-SetCFLAGS: -I%p/include -F/System/Library/Frameworks/CoreFoundation.framework
-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
-Wno-cast-align -Wno-format-security
-SetLDFLAGS: -framework CoreFoundation
+SetCFLAGS: -g -O2 -fstack-protector -Wformat -fPIE
-F/System/Library/Frameworks/CoreFoundation.framework -Wno-unused-parameter
-Wno-missing-field-initializers -Wno-cast-align -Wno-format-security
-Wno-deprecated-writable-strings
+SetCPPFLAGS: -D_FORTIFY_SOURCE=2
+SetCXXFLAGS: -g -O2 -fstack-protector -Wformat -fPIE
+SetLDFLAGS: -Wl,-read_only_stubs -Wl,-bind_at_load -fPIE -Wl,-pie -framework
CoreFoundation
### Uncomment --disable-dselect for bootstrap version, don't make dselect
# --disable-dselect \
ConfigureParams: <<
- --disable-nls \
--disable-start-stop-daemon \
--with-admindir=%p/var/lib/dpkg \
--mandir=%p/share/man \
@@ -109,6 +113,7 @@
--with-bz2 \
--srcdir=%b \
--build=%m-apple-darwin \
+ --disable-linker-optimisations \
PERL_LIBDIR=%p/lib/perl5 \
PERL=/usr/bin/perl
<<
@@ -130,6 +135,7 @@
## currently in fink
# install -c -p -m 644 debian/shlibs.default %i/etc/dpkg
install -c -p -m 644 debian/shlibs.override %i/etc/dpkg
+ install -c -p -m 644 fink/buildflags.conf %i/etc/dpkg/
rm -rf %i/lib/dpkg/methods/*
install -m 0755 fink/md5sum %i/bin
@@ -686,9 +692,13 @@
Essential: yes
### Currently in fink
# ConfFiles: %p/etc/dpkg/shlibs.default %p/etc/dpkg/shlibs.override
- ConfFiles: %p/etc/dpkg/shlibs.override
+ ConfFiles: <<
+ %p/etc/dpkg/shlibs.override
+ %p/etc/dpkg/buildflags.conf
+ <<
Files: <<
etc/dpkg/shlibs.override
+ etc/dpkg/buildflags.conf
bin/dpkg-architecture
bin/dpkg-buildflags
bin/dpkg-buildpackage
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
