Author: pebender
Date: Wed Dec 24 21:47:48 2008
New Revision: 4128
Added:
trunk/gar-minimyth/script/lib/dbus/files/dbus-1.2.10-remove_pie.patch
trunk/gar-minimyth/script/net/portmap/files/portmap-4-pic.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/lib/bluez/Makefile
trunk/gar-minimyth/script/lib/dbus/Makefile
trunk/gar-minimyth/script/lib/dbus/checksums
trunk/gar-minimyth/script/net/portmap/Makefile
trunk/gar-minimyth/script/net/portmap/checksums
Log:
- Patched lib/bluez, lib/dbus and net/portmap so that their binaries are
recognized as executables rather than shared objects by disabling gcc pie
or replacing it with gcc pic.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Dec 24
21:47:48 2008
@@ -23,6 +23,11 @@
Fixed bugs
- Fixed a bug that prevented Wiimote devices from working.
+Fixed build system
+ - Patched lib/bluez, lib/dbus and net/portmap so that their binaries
are
+ recognized as executables rather than shared objects by disabling
gcc pie
+ or replacing it with gcc pic.
+
--------------------------------------------------------------------------------
Changes since 61 (2008-12-23):
Modified: trunk/gar-minimyth/script/lib/bluez/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/bluez/Makefile (original)
+++ trunk/gar-minimyth/script/lib/bluez/Makefile Wed Dec 24 21:47:48 2008
@@ -16,6 +16,9 @@
INSTALL_SCRIPTS = $(WORKSRC)/Makefile
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
+ --disable-gtk-doc \
+ --enable-fortify \
+ --disable-pie \
--enable-network \
--enable-serial \
--enable-input \
Modified: trunk/gar-minimyth/script/lib/dbus/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/dbus/Makefile (original)
+++ trunk/gar-minimyth/script/lib/dbus/Makefile Wed Dec 24 21:47:48 2008
@@ -3,7 +3,7 @@
CATEGORIES = lib
MASTER_SITES = http://dbus.freedesktop.org/releases/dbus/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = $(DISTNAME)-syslog_h.patch
+PATCHFILES = $(DISTNAME)-syslog_h.patch $(DISTNAME)-remove_pie.patch
LICENSE = GPL2
DESCRIPTION =
Modified: trunk/gar-minimyth/script/lib/dbus/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/dbus/checksums (original)
+++ trunk/gar-minimyth/script/lib/dbus/checksums Wed Dec 24 21:47:48 2008
@@ -1,2 +1,3 @@
ae740e0792313c8bb6e2a92ee0b70616 download/dbus-1.2.10.tar.gz
b3f66fddc559497f462d20c3153b94ed download/dbus-1.2.10-syslog_h.patch
+6a2ab31ac7e8432dd89fa8f94189875e download/dbus-1.2.10-remove_pie.patch
Added: trunk/gar-minimyth/script/lib/dbus/files/dbus-1.2.10-remove_pie.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/dbus/files/dbus-1.2.10-remove_pie.patch
Wed Dec 24 21:47:48 2008
@@ -0,0 +1,42 @@
+diff -Naur dbus-1.2.10-old/bus/Makefile.am dbus-1.2.10-new/bus/Makefile.am
+--- dbus-1.2.10-old/bus/Makefile.am 2008-08-07 11:44:35.000000000 -0700
++++ dbus-1.2.10-new/bus/Makefile.am 2008-12-24 11:18:57.000000000 -0800
+@@ -1,7 +1,7 @@
+
+ configdir=$(sysconfdir)/dbus-1
+
+-INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
++INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
+
+@@ -81,7 +81,7 @@
+ $(DBUS_BUS_LIBS) \
+ $(top_builddir)/dbus/libdbus-convenience.la
+
+-dbus_daemon_ldfla...@r_dynamic_ldflag@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_ldfla...@r_dynamic_ldflag@ @SECTION_LDFLAGS@
+
+ LAUNCH_HELPER_SOURCES= \
+ $(XML_SOURCES) \
+diff -Naur dbus-1.2.10-old/bus/Makefile.in dbus-1.2.10-new/bus/Makefile.in
+--- dbus-1.2.10-old/bus/Makefile.in 2008-12-19 11:36:16.000000000 -0800
++++ dbus-1.2.10-new/bus/Makefile.in 2008-12-24 11:18:51.000000000 -0800
+@@ -416,7 +416,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
+
+@@ -480,7 +480,7 @@
+ $(DBUS_BUS_LIBS) \
+ $(top_builddir)/dbus/libdbus-convenience.la
+
+-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+ $(XML_SOURCES) \
+ config-parser-common.c \
Modified: trunk/gar-minimyth/script/net/portmap/Makefile
==============================================================================
--- trunk/gar-minimyth/script/net/portmap/Makefile (original)
+++ trunk/gar-minimyth/script/net/portmap/Makefile Wed Dec 24 21:47:48 2008
@@ -3,7 +3,7 @@
CATEGORIES = net
MASTER_SITES = ftp://ftp.porcupine.org/pub/security/
DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz
-PATCHFILES = portmap-4.0-linux.patch portmap-malloc.patch
portmap-4.0-cleanup.patch portmap-4.0-rpc_user.patch
portmap-4.0-sigpipe.patch portmap-4.0-errno.patch portmap-4.0-pie.patch
portmap-4.0-loopback.patch
+PATCHFILES = portmap-4.0-linux.patch portmap-malloc.patch
portmap-4.0-cleanup.patch portmap-4.0-rpc_user.patch
portmap-4.0-sigpipe.patch portmap-4.0-errno.patch portmap-4.0-pie.patch
portmap-4.0-loopback.patch portmap-4-pic.patch
LICENSE = BSD_4_Clause
DESCRIPTION =
Modified: trunk/gar-minimyth/script/net/portmap/checksums
==============================================================================
--- trunk/gar-minimyth/script/net/portmap/checksums (original)
+++ trunk/gar-minimyth/script/net/portmap/checksums Wed Dec 24 21:47:48 2008
@@ -1,9 +1,10 @@
a6aa06035dbaaac1103fcd87c18b3a5b download/portmap_4.tar.gz
-e6eede62fd9c2119b3381d5455c32287 download/portmap-4.0-cleanup.patch
-0a0ca2a446e491196d474d41772759f7 download/portmap-4.0-errno.patch
b5972eac0427e82d3bcb5584b0b8b4c2 download/portmap-4.0-linux.patch
-89d25ff42c900ace3691af725353fd25 download/portmap-4.0-loopback.patch
-672c6e8b2aa1e86a8203fb8fa34f7320 download/portmap-4.0-pie.patch
+87ef89dedaaa94293786184cee40be52 download/portmap-malloc.patch
+e6eede62fd9c2119b3381d5455c32287 download/portmap-4.0-cleanup.patch
a39796785e98c2e0f9968d898afd1f59 download/portmap-4.0-rpc_user.patch
d0820fd449ae88e56f2a3e78b96bb9d1 download/portmap-4.0-sigpipe.patch
-87ef89dedaaa94293786184cee40be52 download/portmap-malloc.patch
+0a0ca2a446e491196d474d41772759f7 download/portmap-4.0-errno.patch
+672c6e8b2aa1e86a8203fb8fa34f7320 download/portmap-4.0-pie.patch
+89d25ff42c900ace3691af725353fd25 download/portmap-4.0-loopback.patch
+548ed1195ca01886ea99d0dc90dcc042 download/portmap-4-pic.patch
Added: trunk/gar-minimyth/script/net/portmap/files/portmap-4-pic.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/net/portmap/files/portmap-4-pic.patch Wed Dec
24 21:47:48 2008
@@ -0,0 +1,16 @@
+diff -Naur portmap_4-old/Makefile portmap_4-new/Makefile
+--- portmap_4-old/Makefile 2008-12-24 11:02:07.000000000 -0800
++++ portmap_4-new/Makefile 2008-12-24 11:02:52.000000000 -0800
+@@ -75,10 +75,10 @@
+ all: portmap pmap_dump pmap_set
+
+ $(OBJECTS): %.o: %.c
+- $(CC) $(CFLAGS) -fpie -c $<
++ $(CC) $(CFLAGS) -fpic -c $<
+
+ portmap: $(OBJECTS)
+- $(CC) $(CFLAGS) -o $@ -pie $(OBJECTS) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ -pic $(OBJECTS) $(LIBS)
+
+ pmap_dump: pmap_dump.c
+ $(CC) $(CFLAGS) -o $@ $? $(LIBS)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
