[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 507e51748a0431055410f2f584d82ed0aba4f233
by gitï¼ ipfire.org 12 Nov '10
by gitï¼ ipfire.org 12 Nov '10
12 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 507e51748a0431055410f2f584d82ed0aba4f233 (commit)
via 22c28b88414a3c2bd53d2186c72937cb9cd1a34c (commit)
via e2c1801f3ee5352eed5d14a182e5858f480154bd (commit)
via a7e2a658c3912760a90f9dc632178be4845b0cf2 (commit)
via 91e031b951814fe6fc54cf1e5bf8451c3def723f (commit)
via 66be9e1897dcaa921c55ee0515ae077531c850a2 (commit)
via 9c548696cdd01d8ac3a569b4be69e67a639e455c (commit)
via 465dedff9210d3ea02fbf8bd84822e5d37c51562 (commit)
via f94cfa1c687197a44bd5dfcbfc3d91e84c9e56cd (commit)
via 5acc816c332fed7f131dcfaa411bf360a06653ac (commit)
via 28ffaa854a24ee88e075c4e4f072d377a4ab450f (commit)
via ff8e792bd1de123836f046a4ba563b53ba3ebf61 (commit)
via ee151208a44a884f47162313543a6a191e6ce2f3 (commit)
via 228407eff51cb99d5b48e510aeaf2687471e215d (commit)
via 4c8e2fc43ab3f70fcb764d460f0bfb50ade798d1 (commit)
via 7bb93a27d92cfd4bee1e32293bad4a6e6a58be74 (commit)
via 694283d4809ec8ae919b9b274af091ff72767965 (commit)
from 7f6177099661e865f3098752b7b7b1b8c7bf9a31 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 507e51748a0431055410f2f584d82ed0aba4f233
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 21:55:11 2010 +0100
naoki: Change on terminal: Only build one package at once.
commit 22c28b88414a3c2bd53d2186c72937cb9cd1a34c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 21:37:26 2010 +0100
QA: Remove empty directories in right order.
commit e2c1801f3ee5352eed5d14a182e5858f480154bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 21:30:09 2010 +0100
git: New package.
commit a7e2a658c3912760a90f9dc632178be4845b0cf2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 21:29:47 2010 +0100
gmp: Requires gcc-c++ to build.
commit 91e031b951814fe6fc54cf1e5bf8451c3def723f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 21:28:22 2010 +0100
QA: Silently drop messages when find prints an error.
commit 66be9e1897dcaa921c55ee0515ae077531c850a2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 21:06:55 2010 +0100
naoki: Refactor logging.
commit 9c548696cdd01d8ac3a569b4be69e67a639e455c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 19:01:56 2010 +0100
packager: Change syntax of python-api requirement.
commit 465dedff9210d3ea02fbf8bd84822e5d37c51562
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 18:58:09 2010 +0100
Remove a bunch of scripts that are not needed any more.
commit f94cfa1c687197a44bd5dfcbfc3d91e84c9e56cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 18:56:15 2010 +0100
QA: Add check for compressed man pages.
We do not want them because they are kinda ugly.
commit 5acc816c332fed7f131dcfaa411bf360a06653ac
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 18:52:18 2010 +0100
naoki: Fix logging in Environment class.
commit 28ffaa854a24ee88e075c4e4f072d377a4ab450f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 18:46:15 2010 +0100
naoki: Log build time.
commit ff8e792bd1de123836f046a4ba563b53ba3ebf61
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 18:22:49 2010 +0100
naoki: Reimplement logging for packages.
Creating a subdirectory in logs and one log file per release.
commit ee151208a44a884f47162313543a6a191e6ce2f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 02:11:58 2010 +0100
libgcrypt: Fix dependencies of development headers.
commit 228407eff51cb99d5b48e510aeaf2687471e215d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 02:04:20 2010 +0100
ncurses: Fix build.
commit 4c8e2fc43ab3f70fcb764d460f0bfb50ade798d1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 01:56:44 2010 +0100
flex: Remove unneeded library.
(gcc-c++ was added for testsuite.)
commit 7bb93a27d92cfd4bee1e32293bad4a6e6a58be74
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 12 01:39:11 2010 +0100
dracut: Don't delete selinux module.
commit 694283d4809ec8ae919b9b274af091ff72767965
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Nov 11 20:18:37 2010 +0100
naoki: Remove automatic detection of development dependencies.
This causes lots of unneeded dependencies.
-----------------------------------------------------------------------
Summary of changes:
config/logging.ini | 83 --------------------------
make.sh | 4 +-
naoki/__init__.py | 44 +++++++-------
naoki/build.py | 35 -----------
naoki/constants.py | 1 -
naoki/environ.py | 40 ++++++++++---
naoki/logger.py | 69 ++++++----------------
naoki/terminal.py | 8 +--
pkgs/Templates | 3 +-
pkgs/core/dracut/dracut.nm | 9 +--
pkgs/core/flex/flex.nm | 8 +-
pkgs/core/{netplug/netplug.nm => git/git.nm} | 44 ++++++++-----
pkgs/core/gmp/gmp.nm | 2 +-
pkgs/core/libgcrypt/libgcrypt.nm | 3 +-
pkgs/core/ncurses/ncurses.nm | 8 +--
src/scripts/checkrelro | 41 -------------
src/scripts/edit-kernel-config | 11 ----
src/scripts/py-extract-egg | 16 -----
src/scripts/readhash | 22 -------
src/scripts/vpn-watch | 68 ---------------------
tools/functions-packager-find | 4 +-
tools/quality-agent.d/090-man-pages | 17 +++++
tools/quality-agent.d/090-remove-empty-dirs | 2 +-
23 files changed, 138 insertions(+), 404 deletions(-)
delete mode 100644 config/logging.ini
copy pkgs/core/{netplug/netplug.nm => git/git.nm} (59%)
delete mode 100755 src/scripts/checkrelro
delete mode 100644 src/scripts/edit-kernel-config
delete mode 100755 src/scripts/py-extract-egg
delete mode 100644 src/scripts/readhash
delete mode 100644 src/scripts/vpn-watch
create mode 100755 tools/quality-agent.d/090-man-pages
Difference in files:
diff --git a/config/logging.ini b/config/logging.ini
deleted file mode 100644
index 20c2e38..0000000
--- a/config/logging.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[formatters]
-keys: detailed,simple,unadorned,state
-
-[handlers]
-keys: simple_console,detailed_console,unadorned_console,simple_console_warnings_only
-
-[loggers]
-keys: root,build,state,naoki
-
-[formatter_state]
-format: %(asctime)s - %(message)s
-
-[formatter_unadorned]
-format: %(message)s
-
-[formatter_simple]
-format: %(levelname)s: %(message)s
-
-;useful for debugging:
-[formatter_detailed]
-format: %(levelname)s %(filename)s:%(lineno)d: %(message)s
-
-[handler_unadorned_console]
-class: StreamHandler
-args: []
-formatter: unadorned
-level: INFO
-
-[handler_simple_console]
-class: StreamHandler
-args: []
-formatter: simple
-level: INFO
-
-[handler_simple_console_warnings_only]
-class: StreamHandler
-args: []
-formatter: simple
-level: WARNING
-
-[handler_detailed_console]
-class: StreamHandler
-args: []
-formatter: detailed
-level: WARNING
-
-; usually dont want to set a level for loggers
-; this way all handlers get all messages, and messages can be filtered
-; at the handler level
-;
-; all these loggers default to a console output handler
-;
-[logger_root]
-level: NOTSET
-handlers: simple_console
-
-; naoki logger normally has no output
-; catches stuff like naoki.trace_decorator and naoki.util
-; dont normally want to propagate to root logger, either
-[logger_naoki]
-level: NOTSET
-handlers:
-qualname: naoki
-propagate: 1
-
-[logger_state]
-level: NOTSET
-; unadorned_console only outputs INFO or above
-handlers: unadorned_console
-qualname: naoki.Root.state
-propagate: 0
-
-[logger_build]
-level: NOTSET
-handlers: simple_console_warnings_only
-qualname: naoki.Root.build
-propagate: 0
-
-; the following is a list naoki logger qualnames used within the code:
-;
-; qualname: naoki.util
-; qualname: naoki.uid
-; qualname: naoki.trace_decorator
diff --git a/make.sh b/make.sh
index 46b3ae0..0dab425 100755
--- a/make.sh
+++ b/make.sh
@@ -1,6 +1,8 @@
#!/usr/bin/python
+import logging
import sys
+
import naoki
# silence Python 2.6 buggy warnings about Exception.message
@@ -24,6 +26,6 @@ except (SystemExit,):
except (KeyboardInterrupt,):
exitStatus = 7
- n.log.error("Exiting on user interrupt, <CTRL>-C")
+ logging.error("Exiting on user interrupt, <CTRL>-C")
sys.exit(exitStatus)
diff --git a/naoki/__init__.py b/naoki/__init__.py
index 4ad6ae1..11f0cd8 100644
--- a/naoki/__init__.py
+++ b/naoki/__init__.py
@@ -2,6 +2,7 @@
import ConfigParser
import fcntl
+import logging
import os.path
import random
import sys
@@ -20,18 +21,27 @@ import util
from constants import *
+# Initialize logging
+log = logger.Logging()
+
class Naoki(object):
def __init__(self):
- # First, setup the logging
- self.logging = logger.Logging(self)
- self.log = self.logging.log
-
# Second, parse the command line options
self.cli = terminal.Commandline(self)
- self.log.debug("Successfully initialized naoki instance")
+ logging.debug("Successfully initialized naoki instance")
for k, v in config.items():
- self.log.debug(" %s: %s" % (k, v))
+ logging.debug(" %s: %s" % (k, v))
+
+ def debug(self, state):
+ """
+ Enable or disable debugging mode.
+ """
+
+ # Set logging to debug mode
+ log.debug(state)
+
+ config.debug = state
def run(self):
args = self.cli.args
@@ -66,25 +76,17 @@ class Naoki(object):
# Source repository
repo = self._get_source_repos()
- # Initialize job queue
- jobs = build.Jobs()
-
config["shell_on_failure"] = args.shell
- if args.all:
- raise Exception, "XXX to be implemented"
- else:
- for name in args.packages:
- p = repo.find_package_by_name(name)
- if not p:
- raise Exception, "Could not find package: %s" % name
+ package = repo.find_package_by_name(args.package)
+ if not package:
+ raise Exception, "Could not find package: %s" % name
- p = build.Build(p, ignore_dependency_errors=args.ignore_dependency_errors)
- jobs.add(p)
+ # We found a package... build it:
+ b = build.Build(package,
+ ignore_dependency_errors=args.ignore_dependency_errors)
- #return builder.run(ignore_dependency_errors=args.ignore_dependency_errors)
- while jobs.has_jobs:
- jobs.process_next()
+ b.build()
def call_package(self, args):
if not args.has_key("action"):
diff --git a/naoki/build.py b/naoki/build.py
index 259d6a0..81ffac5 100644
--- a/naoki/build.py
+++ b/naoki/build.py
@@ -70,41 +70,6 @@ class Build(object):
e.build()
-class Jobs(object):
- def __init__(self):
- self.__jobs = []
- self.__error_jobs = []
-
- logging.debug("Initialized jobs queue")
-
- def __len__(self):
- return len(self.__jobs)
-
- def add(self, job):
- assert isinstance(job, Build)
-
- self.__jobs.append(job)
-
- @property
- def all(self):
- return self.__jobs[:]
-
- @property
- def has_jobs(self):
- return self.__jobs != []
-
- def process_next(self):
- if not self.__jobs:
- return
-
- job = self.__jobs[0]
-
- try:
- job.build()
- finally:
- self.__jobs.remove(job)
-
-
class PackageShell(Build):
def __init__(self, *args, **kwargs):
Build.__init__(self, *args, **kwargs)
diff --git a/naoki/constants.py b/naoki/constants.py
index f19b8e9..72af9aa 100644
--- a/naoki/constants.py
+++ b/naoki/constants.py
@@ -96,7 +96,6 @@ class Config(object):
"disto_vendor" : "unknown",
#
# Logging
- "log_config_file" : os.path.join(CONFIGDIR, "logging.ini"),
"log_file" : os.path.join(LOGDIR, "naoki.log"),
#
# Reporting
diff --git a/naoki/environ.py b/naoki/environ.py
index 801212d..8f2ecbc 100644
--- a/naoki/environ.py
+++ b/naoki/environ.py
@@ -4,6 +4,7 @@ import grp
import logging
import os
import stat
+import time
import logger
import mail
@@ -38,7 +39,7 @@ class _Environment(object):
}
self._settings.update(settings)
- logging.debug("Successfully initialized %s" % self)
+ self.logger.debug("Successfully initialized %s" % self)
# XXX check if already locked
self.prepare()
@@ -47,14 +48,14 @@ class _Environment(object):
raise NotImplementedError
def clean(self):
- logging.debug("Cleaning environment %s" % self)
+ self.logger.debug("Cleaning environment %s" % self)
if os.path.exists(self.chrootPath()):
util.rm(self.chrootPath())
def prepare(self):
self.clean()
- logging.debug("Preparing environment %s" % self)
+ self.logger.debug("Preparing environment %s" % self)
dirs = (
CACHEDIR,
@@ -154,20 +155,20 @@ class _Environment(object):
nameservers.append(line.split(" ")[-1].strip())
f.close()
- logging.debug("Using nameservers: %s" % nameservers)
+ self.logger.debug("Using nameservers: %s" % nameservers)
f = open(self.chrootPath("etc", "resolv.conf"), "w")
for nameserver in nameservers:
f.write("nameserver %s" % nameserver)
f.close()
- logging.debug("Creating record for localhost")
+ self.logger.debug("Creating record for localhost")
f = open(self.chrootPath("etc", "hosts"), "w")
f.write("127.0.0.1 localhost\n")
f.close()
def extract(self, package, *args):
- logging.info("Extracting %s" % package)
+ self.logger.info("Extracting %s" % package)
package.extract(self.chrootPath(*args))
@@ -221,12 +222,12 @@ class _Environment(object):
return ret
def _mountall(self):
- logging.debug("Mounting environment")
+ self.logger.debug("Mounting environment")
for cmd in self.mountCmds:
util.do(cmd, shell=True)
def _umountall(self):
- logging.debug("Umounting environment")
+ self.logger.debug("Umounting environment")
for cmd in self.umountCmds:
util.do(cmd, raiseExc=0, shell=True)
@@ -284,7 +285,22 @@ class Build(_Environment):
@property
def logger(self):
- return logging.getLogger() # XXX just for now
+ if not hasattr(self, "_logger"):
+ logfile = os.path.join(LOGDIR, self.package.repository.name,
+ self.package.name, self.package.id + ".log")
+
+ # Ensure that logging directory exists
+ util.mkdir(os.path.dirname(logfile))
+
+ self._logger = logging.getLogger(self.package.id)
+
+ fh = logging.FileHandler(logfile)
+ fh.setFormatter(logging.Formatter("%(message)s"))
+ fh.setLevel(logging.NOTSET)
+
+ self._logger.addHandler(fh)
+
+ return self._logger
def chrootPath(self, *args):
return os.path.join(BUILDDIR, "environments", self.package.id, *args)
@@ -305,6 +321,9 @@ class Build(_Environment):
return v
def build(self, *args, **kwargs):
+ # Save starting time
+ time_start = time.time()
+
try:
self.make("package")
except:
@@ -319,6 +338,9 @@ class Build(_Environment):
mail.report_error(self.package)
raise
+ # Log time that was needed to build the package
+ self.logger.info("Build time: %.2fs" % (time.time() - time_start))
+
if config["cleanup_on_success"]:
self.clean()
diff --git a/naoki/logger.py b/naoki/logger.py
index 5ecf0ce..17a409e 100644
--- a/naoki/logger.py
+++ b/naoki/logger.py
@@ -2,7 +2,6 @@
import curses
import logging
-import logging.config
import logging.handlers
import sys
import time
@@ -13,77 +12,45 @@ logging.raiseExceptions = 0
from constants import *
class Logging(object):
- def __init__(self, naoki):
- self.naoki = naoki
-
- self.setup()
-
- def setup(self):
+ def __init__(self):
self.log = logging.getLogger()
+ self.log.setLevel(logging.NOTSET)
- log_ini = config["log_config_file"]
- if os.path.exists(log_ini):
- logging.config.fileConfig(log_ini)
+ # Initialize console
+ ch = self.console
+ ch.setLevel(logging.INFO)
if sys.stderr.isatty():
curses.setupterm()
- self.log.handlers[0].setFormatter(_ColorLogFormatter())
-
- # Set default configuration
- self.quiet(config["quiet"])
-
- self.log.handlers[0].setLevel(logging.DEBUG)
- logging.getLogger("naoki").propagate = 1
+ ch.setFormatter(_ColorLogFormatter())
+ else:
+ ch.setFormatter(logging.Formatter("[%(levelname)s] %(message)s"))
+ self.log.addHandler(ch)
+ # Initialize log file
if not os.path.isdir(LOGDIR):
os.makedirs(LOGDIR)
fh = logging.handlers.RotatingFileHandler(config["log_file"],
maxBytes=10*1024**2, backupCount=6)
fh.setFormatter(logging.Formatter("[%(levelname)s] %(message)s"))
- fh.setLevel(logging.NOTSET)
+ fh.setLevel(logging.DEBUG)
self.log.addHandler(fh)
- def quiet(self, val):
- if val:
- self.log.debug("Enabled quiet logging mode")
- self.log.handlers[0].setLevel(logging.WARNING)
- else:
- #self.log.debug("Enabled verbose logging mode")
- self.log.handlers[0].setLevel(logging.INFO)
-
def debug(self, val):
if val:
- self.log.handlers[0].setLevel(logging.DEBUG)
+ self.console.setLevel(logging.DEBUG)
self.log.debug("Enabled debug logging mode")
else:
self.log.debug("Disabled debug logging mode")
- self.log.handlers[0].setLevel(logging.INFO)
-
- def _setupBuildLogger(self, logger, package):
- logger.setLevel(logging.DEBUG)
- logger.parent = self.log
- logger.propagate = 1
-
- logfile = package.logfile
- logdir = os.path.dirname(logfile)
-
- if not os.path.exists(logdir):
- os.makedirs(logdir)
-
- handler = logging.handlers.RotatingFileHandler(logfile,
- maxBytes=10*1024**2, backupCount=5)
-
- formatter = logging.Formatter("[BUILD] %(message)s")
- handler.setFormatter(formatter)
+ self.console.setLevel(logging.INFO)
- logger.addHandler(handler)
+ @property
+ def console(self):
+ console = self.log.handlers[0]
- def getBuildLogger(self, package):
- logger = logging.getLogger(package.id)
- if not logger.handlers:
- self._setupBuildLogger(logger, package)
+ assert isinstance(console, logging.StreamHandler)
- return logger
+ return console
# defaults to module verbose log
diff --git a/naoki/terminal.py b/naoki/terminal.py
index 039f8a9..7d9f1fa 100644
--- a/naoki/terminal.py
+++ b/naoki/terminal.py
@@ -257,12 +257,8 @@ class Commandline(object):
self.__process_global(self.args)
def __process_global(self, args):
- # Set quiet mode
- self.naoki.logging.quiet(args.quiet)
-
# Set debugging mode
- config.debug = args.debug
- self.naoki.logging.debug(args.debug)
+ self.naoki.debug(args.debug)
# Set architecture
arches.set_default(args.arch)
@@ -286,7 +282,7 @@ class Commandline(object):
Option("ignore_dependency_errors", ["-i", "--ignore-dependency-errors"],
help="Ignore dependency errors."),
Option("shell", ["-s", "--shell"], help="Enter a shell after unsuccessfull build."),
- List("packages", help="Give a list of packages to build."),
+ Argument("package", help="Name of a package to build."),
]),
# Package
diff --git a/pkgs/Templates b/pkgs/Templates
index f1cba10..e1196ad 100644
--- a/pkgs/Templates
+++ b/pkgs/Templates
@@ -21,8 +21,7 @@ PKG_FILES = /
PKG_DESCRIPTION-$(PKG_NAME_REAL)-devel = Development files of $(THISAPP).
PKG_SUMMARY-$(PKG_NAME_REAL)-devel = $(PKG_DESCRIPTION-$(PKG_NAME_REAL)-devel)
-PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL)=$(THISVER) \
- $(foreach dep,$(PKG_BUILD_DEPS),$(if $(findstring -devel,$(dep)),$(dep)))
+PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL)=$(THISVER)
define PKG_FILES-$(PKG_NAME_REAL)-devel
/usr/bin/*-config
diff --git a/pkgs/core/dracut/dracut.nm b/pkgs/core/dracut/dracut.nm
index e467063..6d80a04 100644
--- a/pkgs/core/dracut/dracut.nm
+++ b/pkgs/core/dracut/dracut.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = dracut
PKG_VER = 007
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUP = System/Boot
@@ -35,8 +35,8 @@ PKG_LICENSE = GPLv2+
PKG_SUMMARY = Initramfs generator using udev.
PKG_DEPS += bash bzip2 cpio coreutils dmraid e2fsprogs eject gzip \
- iproute2 iputils kbd less lvm2 mdadm multipath-tools sysvinit udev \
- util-linux-ng which
+ iproute2 iputils kbd less libselinux lvm2 mdadm multipath-tools \
+ sysvinit udev util-linux-ng which
define PKG_DESCRIPTION
dracut is a new, event-driven initramfs infrastructure based around udev.
@@ -62,7 +62,4 @@ endef
define STAGE_INSTALL
cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) WITH_SWITCH_ROOT=1 \
sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man
-
- # Remove unneeded modules
- rm -rfv $(BUILDROOT)/usr/share/dracut/modules.d/*selinux
endef
diff --git a/pkgs/core/flex/flex.nm b/pkgs/core/flex/flex.nm
index 90e953b..0dd33fb 100644
--- a/pkgs/core/flex/flex.nm
+++ b/pkgs/core/flex/flex.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = flex
PKG_VER = 2.5.35
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = Development/Tools
@@ -34,11 +34,9 @@ PKG_URL = http://flex.sourceforge.net/
PKG_LICENSE = BSD
PKG_SUMMARY = A tool for creating scanners (text pattern recognizers).
-PKG_BUILD_DEPS+= bison m4
+PKG_BUILD_DEPS+= bison gcc-c++ m4
PKG_DEPS += m4
-# XXX possibly we can remove libfl_pic and things in /usr/include
-
define PKG_DESCRIPTION
The flex program generates scanners. Scanners are programs which can \
recognize lexical patterns in text. Flex takes pairs of regular \
@@ -64,4 +62,6 @@ define STAGE_INSTALL_CMDS
echo "#!/bin/sh" > $(BUILDROOT)/usr/bin/lex
echo "exec /usr/bin/flex -l \"$$@\"" >> $(BUILDROOT)/usr/bin/lex
chmod 755 $(BUILDROOT)/usr/bin/lex
+
+ rm -rvf $(BUILDROOT)/usr/{include,lib}
endef
diff --git a/pkgs/core/git/git.nm b/pkgs/core/git/git.nm
new file mode 100644
index 0000000..ded2da2
--- /dev/null
+++ b/pkgs/core/git/git.nm
@@ -0,0 +1,69 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = git
+PKG_VER = 1.7.3.2
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = Development/Tools
+PKG_URL = http://git-scm.com/
+PKG_LICENSE = GPLv2
+PKG_SUMMARY = Fast Version Control System.
+
+PKG_BUILD_DEPS+= expat-devel gettext libcurl-devel openssl-devel zlib-devel
+PKG_DEPS += less openssh-clients rsync /usr/bin/vi
+
+define PKG_DESCRIPTION
+ Git is a fast, scalable, distributed revision control system with an \
+ unusually rich command set that provides both high-level operations \
+ and full access to internals.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.bz2
+
+define STAGE_PREPARE_CMDS
+ echo "CFLAGS = $(CFLAGS)" > $(DIR_APP)/config.mak
+ echo "BLK_SHA1 = 1" >> $(DIR_APP)/config.mak
+ echo "NEEDS_CRYPTO_WITH_SSL = 1" >> $(DIR_APP)/config.mak
+ echo "NO_PERL = 1" >> $(DIR_APP)/config.mak
+ echo "NO_PYTHON = 1" >> $(DIR_APP)/config.mak
+ echo "NO_TCLTK = 1" >> $(DIR_APP)/config.mak
+ echo "ETC_GITCONFIG = /etc/gitconfig" >> $(DIR_APP)/config.mak
+ echo "DESTDIR = $(BUILDROOT)" >> $(DIR_APP)/config.mak
+ echo "INSTALL = install -p" >> $(DIR_APP)/config.mak
+ echo "GITWEB_PROJECTROOT = /var/lib/git" >> $(DIR_APP)/config.mak
+ echo "htmldir = /usr/share/doc/$(THISAPP)" >> $(DIR_APP)/config.mak
+ echo "prefix = /usr" >> $(DIR_APP)/config.mak
+ echo "gitwebdir = /var/www/git" >> $(DIR_APP)/config.mak
+ echo "gitexecdir = lib/git-core" >> $(DIR_APP)/config.mak
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
+
+STAGE_INSTALL_TARGETS += INSTALLDIRS=vendor
diff --git a/pkgs/core/gmp/gmp.nm b/pkgs/core/gmp/gmp.nm
index f2fe601..9084e7a 100644
--- a/pkgs/core/gmp/gmp.nm
+++ b/pkgs/core/gmp/gmp.nm
@@ -46,7 +46,7 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-PKG_BUILD_DEPS+= m4
+PKG_BUILD_DEPS+= gcc-c++ m4
PKG_PACKAGES += $(PKG_NAME_REAL)-devel
diff --git a/pkgs/core/libgcrypt/libgcrypt.nm b/pkgs/core/libgcrypt/libgcrypt.nm
index 6c50144..080b244 100644
--- a/pkgs/core/libgcrypt/libgcrypt.nm
+++ b/pkgs/core/libgcrypt/libgcrypt.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = libgcrypt
PKG_VER = 1.4.6
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUP = System/Libraries
@@ -35,6 +35,7 @@ PKG_LICENSE = LGPLv2.1+
PKG_SUMMARY = A general-purpose cryptography library.
PKG_BUILD_DEPS+= gcc-c++ libgpg-error-devel
+PKG_DEPS-$(PKG_NAME_REAL)-devel += libgpg-error-devel
define PKG_DESCRIPTION
Libgcrypt is a general purpose crypto library based on the code used \
diff --git a/pkgs/core/ncurses/ncurses.nm b/pkgs/core/ncurses/ncurses.nm
index 10d00db..251a8f1 100644
--- a/pkgs/core/ncurses/ncurses.nm
+++ b/pkgs/core/ncurses/ncurses.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = ncurses
PKG_VER = 5.7
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = System/Base
@@ -34,7 +34,7 @@ PKG_URL = http://invisible-island.net/ncurses/ncurses.html
PKG_LICENSE = MIT
PKG_SUMMARY = Ncurses support utilities.
-PKG_PACKAGES += $(PKG_NAME_REAL)-devel
+PKG_BUILD_DEPS+= gcc-c++
define PKG_DESCRIPTION
The curses library routines are a terminal-independent method of \
@@ -45,9 +45,7 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-###############################################################################
-# Installation Details
-###############################################################################
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel
define STAGE_BUILD
cd $(DIR_APP) && \
diff --git a/src/scripts/checkrelro b/src/scripts/checkrelro
deleted file mode 100755
index 8bec63f..0000000
--- a/src/scripts/checkrelro
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-function message() {
- printf "%-40s - %s\n" "${file}" "$@"
-}
-
-function verbose() {
- [ "${verbose}" = "1" ]
-}
-
-files=
-for arg in $@; do
- case "${arg}" in
- --verbose|-v)
- verbose=1
- continue
- ;;
- esac
- if [ -d "${arg}" ]; then
- files="${files} $(find ${arg} -type f)"
- else
- files="${files} ${arg}"
- fi
-done
-
-for file in ${files}; do
- if [ -L "${file}" ] || \
- (file ${file} | grep -vq "shared object"); then
- continue
- fi
-
- if readelf -l ${file} 2>/dev/null | grep -q "GNU_RELRO"; then
- if readelf -d ${file} 2>/dev/null | grep -q "BIND_NOW"; then
- verbose && message "full RELRO"
- else
- message "partial RELRO"
- fi
- else
- message "no RELRO"
- fi
-done
diff --git a/src/scripts/edit-kernel-config b/src/scripts/edit-kernel-config
deleted file mode 100644
index f8bb6a4..0000000
--- a/src/scripts/edit-kernel-config
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-cd /usr/src/linux*
-
-cp -f /usr/src/src/kernel/kernel.config .config
-
-make menuconfig
-
-if [ "$?" -eq "0" ]; then
- cp -f .config /usr/src/src/kernel/kernel.config
-fi
diff --git a/src/scripts/py-extract-egg b/src/scripts/py-extract-egg
deleted file mode 100755
index fe01713..0000000
--- a/src/scripts/py-extract-egg
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Extract python eggs
-
-EGG=${1}
-
-if [ -z "${EGG}" ] || [ ! -e "${EGG}" ]; then
- echo "$0: No egg given or file does not exist." >&2
- exit 1
-fi
-
-cd $(dirname ${EGG})
-
-unzip -o ${EGG} || exit 1
-
-rm -rf EGG-INFO #${EGG}
diff --git a/src/scripts/readhash b/src/scripts/readhash
deleted file mode 100644
index 63a3e0f..0000000
--- a/src/scripts/readhash
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# This script reads in variables from a config file, and produces a list of
-# commands to run to set these as shell environment variables, it is
-# intended to be used as follows:
-#
-# eval $(readhash /var/ipfire/main/settings)
-#
-
-# shell variables must consist of alphanumeric characters and underscores,
-# and begin with an alphabetic character or underscore.
-VARNAME='[A-Za-z_][A-zA-z0-9_]*'
-
-# For the assigned value we only accept a limited number of characters - none
-# of which are shell metachars
-VARCHARS='A-Za-z0-9=/,._@#+-'
-VARVAL="[${VARCHARS}]*"
-
-sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1
-
-# Accept space only if it's quoted
-sed -ne "s/\(${VARNAME}\)=\('[ ${VARCHARS}]*'\)$/\1=\2/p" $1
diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
deleted file mode 100644
index 74a4dc5..0000000
--- a/src/scripts/vpn-watch
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/perl
-##################################################
-##### VPN-Watch.pl Version 0.4 #####
-##################################################
-# #
-# VPN-Watch is part of the IPFire Firewall #
-# #
-##################################################
-
-use strict;
-
-require '/var/ipfire/general-functions.pl';
-my @vpnsettings;
-my $i = 0;
-my $file = "/var/run/vpn-watch.pid";
-my $debug = 0;
-
-if ( -e $file ){
- logger("There my be another vpn-watch runnning because $file exists, vpn-watch will try kill the process.");
- open(FILE, "<$file");
- my $PID = <FILE>;
- close(FILE);
- system("kill -9 $PID");
- }
-
-system("echo $$ > $file");
-
-while ( $i == 0){
- if ($debug){logger("We will wait 300 seconds before next action.");}
- sleep(300);
-
- if (open(FILE, "<${General::swroot}/vpn/config")) {
- @vpnsettings = <FILE>;
- close(FILE);
- unless(@vpnsettings) {exit 1;}
- }
-
-foreach (@vpnsettings){
- my @settings = split(/,/,$_);
-
- if ($settings[27] ne 'RED'){next;}
- if ($settings[4] ne 'net'){next;}
- if ($settings[1] ne 'on'){next;}chomp($settings[29]);
- if ($settings[29] ne 'on'){next;}
-
- my $remotehostname = $settings[11];
-
- if ($debug){logger("Checking connection to $remotehostname.");}
-
- my $remoteip = `/usr/bin/ping -c 1 $remotehostname 2>/dev/null | head -n1 | awk '{print \$3}' | tr -d '()' | tr -d ':'`;chomp($remoteip);
- if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
- my $connected= `ipsec whack --status | grep $remoteip`;
- my $established= `ipsec whack --status | grep '$settings[2]' | grep 'IPsec SA established'`;
-
- if ( $established eq '' || $connected eq '' ){
- logger("Remote IP for host $remotehostname has changed or no connection is established, restarting connection to $remoteip.");
- system("/usr/local/bin/ipsecctrl S $settings[0]");
- next;
- }
- if ($debug){logger("All connections may be fine nothing was done.");}
- }
-}
-
-sub logger {
- my $log = shift;
- system("logger -t vpnwatch \"$log\"");
-}
-
diff --git a/tools/functions-packager-find b/tools/functions-packager-find
index 7c2ec67..bc97483 100644
--- a/tools/functions-packager-find
+++ b/tools/functions-packager-find
@@ -132,7 +132,7 @@ function find_python_provides() {
file=${file#python}
if [ -n "${file}" ]; then
- echo "python-api-${file}"
+ echo "python-api=${file}"
fi
done
}
@@ -148,7 +148,7 @@ function find_python_requires() {
file=${file#python}
if [ -n "${file}" ]; then
- echo "python-api-${file}"
+ echo "python-api=${file}"
fi
fi
done
diff --git a/tools/quality-agent.d/090-man-pages b/tools/quality-agent.d/090-man-pages
new file mode 100755
index 0000000..0720d10
--- /dev/null
+++ b/tools/quality-agent.d/090-man-pages
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. $(dirname ${0})/qa-include
+
+DESC="Decompressing man-pages..."
+
+function check() {
+ for file in $(find ${BUILDROOT}/usr/share/man -type f 2>/dev/null); do
+ log DEBUG " Processing: ${file}"
+ if [[ ${file} =~ \.gz$ ]]; then
+ gzip -d ${file}
+ fi
+ done
+}
+
+run
+
diff --git a/tools/quality-agent.d/090-remove-empty-dirs b/tools/quality-agent.d/090-remove-empty-dirs
index f8a39fd..d1d61a1 100755
--- a/tools/quality-agent.d/090-remove-empty-dirs
+++ b/tools/quality-agent.d/090-remove-empty-dirs
@@ -5,7 +5,7 @@
DESC="Remove unwanted files."
function check() {
- for dir in {,/usr}/{{,s}bin,lib{,exec}} /usr/share/man{,/man{0,1,2,3,4,5,6,7,8,9}}; do
+ for dir in $(sort_by_length {,/usr}/{{,s}bin,lib{,exec}} /usr/share/man{,/man{0,1,2,3,4,5,6,7,8,9}}); do
dir="${BUILDROOT}/${dir}"
if [ -d "${dir}" ] && [ "$(ls -1A ${dir} | wc -l)" = "0" ]; then
log DEBUG " Removing ${dir}"
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7f6177099661e865f3098752b7b7b1b8c7bf9a31
by gitï¼ ipfire.org 11 Nov '10
by gitï¼ ipfire.org 11 Nov '10
11 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 7f6177099661e865f3098752b7b7b1b8c7bf9a31 (commit)
via a3ad4803fdd3790cf6e454e97d96416ae39a803a (commit)
from 1489265bb94280a10d8d2b88b93651435787121b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f6177099661e865f3098752b7b7b1b8c7bf9a31
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Nov 11 13:06:35 2010 +0100
glibc: Split into some smaller packages.
Closes #89.
commit a3ad4803fdd3790cf6e454e97d96416ae39a803a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Nov 11 13:00:43 2010 +0100
naoki: Forgot to remove GLIBC_PRIVATE in requires, too.
-----------------------------------------------------------------------
Summary of changes:
pkgs/core/glibc/glibc.nm | 119 ++++++++++++++++++++++++++++++++++++++--
tools/functions-packager-find | 2 +-
2 files changed, 114 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 3d0e561..1d71ce9 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -26,7 +26,9 @@ include $(PKGROOT)/Include
PKG_NAME = glibc
PKG_VER = 2.12.1
-PKG_REL = 3
+PKG_REL = 4
+
+# TODO tzdata
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUP = System/Base
@@ -36,8 +38,6 @@ PKG_SUMMARY = The GNU libc libraries.
PKG_BUILD_DEPS+= autoconf automake gettext libselinux-devel texinfo
-PKG_PACKAGES += $(PKG_NAME_REAL)-devel
-
define PKG_DESCRIPTION
The glibc package contains standard libraries which are used by \
multiple programs on the system. In order to save disk space and \
@@ -48,7 +48,7 @@ define PKG_DESCRIPTION
Linux system will not function.
endef
-GLIBC_FLAGS += -fno-strict-aliasing -mno-tls-direct-seg-refs
+GLIBC_FLAGS += -fno-strict-aliasing -mno-tls-direct-seg-refs -DNDEBUG
CFLAGS += $(GLIBC_FLAGS)
CXXFLAGS += $(GLIBC_FLAGS)
@@ -279,8 +279,115 @@ define STAGE_INSTALL
# Configuration
cp -vf $(DIR_SOURCE)/{ld.so.conf,nsswitch.conf} $(BUILDROOT)/etc
- -mkdir -pv $(BUILDROOT)/etc/ld.so.conf.d
+ -mkdir -pv $(BUILDROOT)/etc/{default,ld.so.conf.d}
+ install -p -m644 $(DIR_APP)/nis/nss $(BUILDROOT)/etc/default/nss
# Remove unused binaries
- rm -vf $(BUILDROOT)/sbin/sln
+ rm -vf $(BUILDROOT)/sbin/sln \
+ $(BUILDROOT)/usr/bin/rpcinfo
+
+ # Don't distribute linker cache
+ rm -vf $(BUILDROOT)/etc/ld.so.cache
+
+ # Include /usr/lib/gconv/gconv-modules.cache
+ > $(BUILDROOT)/usr/lib/gconv/gconv-modules.cache
+ chmod 644 $(BUILDROOT)/usr/lib/gconv/gconv-modules.cache
+
+ strip -g $(BUILDROOT)/usr/lib/*.o
+
+ # Move some libs to correct place
+ mv -v $(BUILDROOT)/lib/lib{memusage,pcprofile}.so $(BUILDROOT)/usr/lib/
+endef
+
+### Packages
+
+# glibc-common
+PKG_PACKAGES += $(PKG_NAME)-common
+PKG_DEPS += $(PKG_NAME)-common
+
+define PKG_FILES-$(PKG_NAME)-common
+ /usr/bin
+ /usr/sbin
+ /usr/share
+ !/usr/share/zoneinfo
+endef
+
+# glibc-devel
+PKG_PACKAGES += $(PKG_NAME)-devel
+
+PKG_SUMMARY-$(PKG_NAME)-devel = \
+ Object files for development using standard C libraries.
+PKG_GROUP-$(PKG_NAME)-devel = Development/Libraries
+PKG_DEPS-$(PKG_NAME)-devel += $(PKG_NAME)-headers
+
+define PKG_DESCRIPTION-$(PKG_NAME)-devel
+ The glibc-devel package contains the object files necessary
+ for developing programs which use the standard C libraries (which are
+ used by nearly all programs). If you are developing programs which
+ will use the standard C libraries, your system needs to have these
+ standard object files available in order to create the
+ executables.
+
+ Install glibc-devel if you are going to develop programs which will
+ use the standard C libraries.
+endef
+
+PKG_FILES-$(PKG_NAME)-devel += /usr/lib/*.a /usr/lib/*.o
+
+# glibc-headers
+PKG_PACKAGES += $(PKG_NAME)-headers
+
+PKG_DEPS-$(PKG_NAME)-headers += kernel-headers
+
+define PKG_DESCRIPTION-$(PKG_NAME)-heasders
+ The glibc-headers package contains the header files necessary
+ for developing programs which use the standard C libraries (which are
+ used by nearly all programs). If you are developing programs which
+ will use the standard C libraries, your system needs to have these
+ standard header files available in order to create the
+ executables.
+
+ Install glibc-headers if you are going to develop programs which will
+ use the standard C libraries.
+endef
+
+define PKG_FILES-$(PKG_NAME)-headers
+ /usr/include
+ !/usr/include/linuxthreads
+ !/usr/include/gnu/stubs-[32164]*.h
+endef
+
+# nscd
+PKG_PACKAGES += nscd
+
+PKG_SUMMARY-nscd = A Name Service Caching Daemon (nscd).
+PKG_GROUP-nscd = System/Daemons
+
+define PKG_DESCRIPTION-nscd
+ Nscd caches name service lookups and can dramatically improve \
+ performance with NIS+, and may help with DNS as well.
+endef
+
+define PKG_FILES-nscd
+ /usr/sbin/nscd
+endef
+
+# glibc-utils
+PKG_PACKAGES += $(PKG_NAME)-utils
+
+PKG_SUMMARY-$(PKG_NAME)-utils = Development utilities from GNU C library.
+PKG_GROUP-$(PKG_NAME)-utils = Development/Tools
+define PKG_DESCRIPTION_$(PKG_NAME)-utils
+ The glibc-utils package contains memusage, a memory usage profiler, \
+ mtrace, a memory leak tracer and xtrace, a function call tracer \
+ which can be helpful during program debugging.
+endef
+
+define PKG_FILES-$(PKG_NAME)-utils
+ /usr/bin/memusage{,stat}
+ /usr/bin/mtrace
+ /usr/bin/pcprofiledump
+ /usr/bin/xtrace
+ /usr/lib/libmemusage.so
+ /usr/lib/libpcprofile.so
endef
diff --git a/tools/functions-packager-find b/tools/functions-packager-find
index e12eeb7..7c2ec67 100644
--- a/tools/functions-packager-find
+++ b/tools/functions-packager-find
@@ -210,5 +210,5 @@ function find_weak_symbols_requires() {
(START==2) && (LIBNAME!="") && ($4!="") && (($4~/^GLIBC_*/) || ($4~/^GCC_*/)) {
print LIBNAME "(" $4 ")";
}'
- done | sort -u
+ done | grep -v "GLIBC_PRIVATE" | sort -u
}
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1489265bb94280a10d8d2b88b93651435787121b
by gitï¼ ipfire.org 11 Nov '10
by gitï¼ ipfire.org 11 Nov '10
11 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 1489265bb94280a10d8d2b88b93651435787121b (commit)
via c34655a05e602d654b78a1ce63b08fd46b06f459 (commit)
via ddf0d8778893af0c1a9ec79f272637086551632b (commit)
from eee6bb52534a63a9af166857a087afaf60a98a6d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1489265bb94280a10d8d2b88b93651435787121b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Nov 8 22:33:25 2010 +0100
packager: Omit GLIBC_PRIVATE symbols.
Those will never appear at any other place.
commit c34655a05e602d654b78a1ce63b08fd46b06f459
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Nov 8 17:55:13 2010 +0100
lzo: Update to 2.04.
Fixes #90.
commit ddf0d8778893af0c1a9ec79f272637086551632b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Nov 8 14:00:17 2010 +0100
ccache: Update to 3.1.1.
Resolved minor bugs.
-----------------------------------------------------------------------
Summary of changes:
pkgs/core/ccache/ccache.nm | 2 +-
pkgs/core/lzo/lzo.nm | 2 +-
tools/functions-packager-find | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm
index 80167d4..fc3d719 100644
--- a/pkgs/core/ccache/ccache.nm
+++ b/pkgs/core/ccache/ccache.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = ccache
-PKG_VER = 3.1
+PKG_VER = 3.1.1
PKG_REL = 0
PKG_MAINTAINER =
diff --git a/pkgs/core/lzo/lzo.nm b/pkgs/core/lzo/lzo.nm
index 89363aa..05aed17 100644
--- a/pkgs/core/lzo/lzo.nm
+++ b/pkgs/core/lzo/lzo.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = lzo
-PKG_VER = 2.03
+PKG_VER = 2.04
PKG_REL = 0
PKG_MAINTAINER =
diff --git a/tools/functions-packager-find b/tools/functions-packager-find
index 803a1b1..e12eeb7 100644
--- a/tools/functions-packager-find
+++ b/tools/functions-packager-find
@@ -183,6 +183,7 @@ function find_weak_symbols_provides() {
for symbol in $(objdump -p ${file} | grep -E "^[0-9]+" | awk '{ print $4 }'); do
[ "${symbol}" = "${soname}" ] && continue
+ [ "${symbol}" = "GLIBC_PRIVATE" ] && continue
echo "${soname}(${symbol})"
done
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 50f696157ff447b332b92588588dbfa5cf98fef3
by gitï¼ ipfire.org 10 Nov '10
by gitï¼ ipfire.org 10 Nov '10
10 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 50f696157ff447b332b92588588dbfa5cf98fef3 (commit)
via 499bc000ffd5e65325d1fa9bbf7e1085b62eaea3 (commit)
via 324cae81712b7b1b7b80333ad92e369cac28b6ce (commit)
via 3bb552552806066293fcfbedb8a41458393cfcd0 (commit)
via bab14e7ee263c0d19028130061b8376f7ed17fbc (commit)
via 83db6800ddea7be6553fb9fd3ee8f4641f1f69f5 (commit)
via 4507470068e2fcecde6ebc522b977156e964846f (commit)
via 29e453bcce26da749901ffefe28b9f81348f0d26 (commit)
from c331896e29394556a9e620147212d52cf55e70d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 50f696157ff447b332b92588588dbfa5cf98fef3
Merge: c331896 499bc00
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 10 22:01:28 2010 +0100
Merge commit 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/bzip2 | 2 +-
config/rootfiles/packages/ipfireseeder | 2 +-
html/cgi-bin/wlanap.cgi | 14 ++++++++++----
lfs/ipfireseeder | 6 +++---
lfs/mISDN | 1 +
src/patches/mISDN_hfc-s_add_id.patch | 28 ++++++++++++++++++++++++++++
6 files changed, 44 insertions(+), 9 deletions(-)
create mode 100644 src/patches/mISDN_hfc-s_add_id.patch
Difference in files:
diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2
index b91b89d..4292fd3 100644
--- a/config/rootfiles/common/bzip2
+++ b/config/rootfiles/common/bzip2
@@ -14,7 +14,7 @@ usr/bin/bzip2
usr/bin/bzip2recover
usr/bin/bzless
usr/bin/bzmore
-usr/include/bzlib.h
+#usr/include/bzlib.h
#usr/lib/libbz2.a
#usr/lib/libbz2.so
#usr/man/man1/bzcmp.1
diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index bacd4dd..e67f850 100644
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
etc/rc.d/init.d/ipfireseeder
#var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core41.iso.torrent
#var/log/seeder
var/log/seeder/info
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 0301895..cd5bda3 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -371,14 +371,20 @@ foreach $channel (@channellist){
print <<END
</select></td></tr>
-<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'><select name='TXPOWER'>
+<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'>
END
;
-foreach $txpower (@txpower){
- print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm";
+
+if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
+ print "<select name='TXPOWER'>";
+ foreach $txpower (@txpower){
+ print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm";
+ }
+ print " </select></td></tr>";
+} else {
+ print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
}
print <<END
- </select></td></tr>
<tr><td width='25%' class='base'>Passphrase: </td><td class='base' colspan='3'><input type='text' name='PWD' size='63' value='$wlanapsettings{'PWD'}' /></td></tr>
<tr><td width='25%' class='base'>HT Caps: </td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='63' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
<tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'>
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index b2a65ca..7d7a3c2 100644
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
-DL_FILE = ipfire-2.7.i586-full-core40.iso.torrent
+DL_FILE = ipfire-2.7.i586-full-core41.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
-PAK_VER = 15
+PAK_VER = 16
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6475e2d772a39db73ea869328f98d2f3
+$(DL_FILE)_MD5 = de05c43a1bc513eae06f16fcc2a8f94b
install : $(TARGET)
diff --git a/lfs/mISDN b/lfs/mISDN
index 349f260..8eec207 100644
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
+ cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \
diff --git a/src/patches/mISDN_hfc-s_add_id.patch b/src/patches/mISDN_hfc-s_add_id.patch
new file mode 100644
index 0000000..d544b1f
--- /dev/null
+++ b/src/patches/mISDN_hfc-s_add_id.patch
@@ -0,0 +1,28 @@
+diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/hardware/mISDN/hfcpci.c
+--- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c 2010-05-25 10:41:29.000000000 +0200
++++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2010-10-31 11:19:05.000000000 +0100
+@@ -88,6 +88,7 @@
+ HFC_DIGI_DF_M_A,
+ HFC_ABOCOM_2BD1,
+ HFC_SITECOM_DC105V2,
++ HFC_NONAME_1AE7_0520,
+ };
+
+ struct hfcPCI_hw {
+@@ -2182,6 +2183,7 @@
+ {HFC_DIGI_DF_M_A, 0,
+ "Digi International DataFire Micro V (North America)"},
+ {HFC_SITECOM_DC105V2, 0, "Sitecom Connectivity DC-105 ISDN TA"},
++ {HFC_NONAME_1AE7_0520, 0, "NoName HFC-S (1AE7:0520) ISDN TA"},
+ {},
+ };
+
+@@ -2233,6 +2235,8 @@
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
+ {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
++ {0x1ae7, 0x0520,
++ PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[23]},
+ {},
+ };
+
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c331896e29394556a9e620147212d52cf55e70d5
by gitï¼ ipfire.org 10 Nov '10
by gitï¼ ipfire.org 10 Nov '10
10 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via c331896e29394556a9e620147212d52cf55e70d5 (commit)
via fb1729a9cac8d5ffd92313fd2c2b35951626f04b (commit)
via 78a51aafa5ec9aea289e5de908f77e6954c93894 (commit)
from 89e7a0f529a1dba49084faa01ef06aeb9e9dc0ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c331896e29394556a9e620147212d52cf55e70d5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 10 22:00:05 2010 +0100
Enabled build on x86_64 machines.
commit fb1729a9cac8d5ffd92313fd2c2b35951626f04b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 10 21:44:46 2010 +0100
cdrtoos: rootfile update.
commit 78a51aafa5ec9aea289e5de908f77e6954c93894
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Nov 8 12:18:08 2010 +0100
Kernel: Enabled IPV6 at build and disabled at runtime.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 78 +++++++++++++++++++-
config/kernel/kernel.config.i586-ipfire-pae | 76 +++++++++++++++++++-
config/kernel/kernel.config.i586-ipfire-xen | 76 +++++++++++++++++++-
config/rootfiles/common/cdrtools | 4 +
config/rootfiles/common/linux | 103 +++++++++------------------
config/rootfiles/packages/linux-pae | 34 +++++++++
config/rootfiles/packages/linux-xen | 101 +++++++++-----------------
lfs/linux | 4 +
make.sh | 14 +++-
tools/make-functions | 6 +-
10 files changed, 345 insertions(+), 151 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 9e27f08..3be9bc6 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.25
-# Sat Oct 30 11:06:16 2010
+# Thu Nov 4 13:33:56 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -587,7 +587,26 @@ CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_DEFAULT_RENO=y
CONFIG_DEFAULT_TCP_CONG="reno"
# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -673,7 +692,36 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
#
# IP: Netfilter Configuration
@@ -717,6 +765,27 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_IP_NF_MATCH_IPP2P=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -725,6 +794,7 @@ CONFIG_BRIDGE_EBT_802_3=m
CONFIG_BRIDGE_EBT_AMONG=m
CONFIG_BRIDGE_EBT_ARP=m
CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
CONFIG_BRIDGE_EBT_LIMIT=m
CONFIG_BRIDGE_EBT_MARK=m
CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -809,7 +879,7 @@ CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index f0dee5a..741b73a 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -592,7 +592,26 @@ CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_DEFAULT_RENO=y
CONFIG_DEFAULT_TCP_CONG="reno"
# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -678,7 +697,36 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
#
# IP: Netfilter Configuration
@@ -722,6 +770,27 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_IP_NF_MATCH_IPP2P=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -730,6 +799,7 @@ CONFIG_BRIDGE_EBT_802_3=m
CONFIG_BRIDGE_EBT_AMONG=m
CONFIG_BRIDGE_EBT_ARP=m
CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
CONFIG_BRIDGE_EBT_LIMIT=m
CONFIG_BRIDGE_EBT_MARK=m
CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -814,7 +884,7 @@ CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 746d60c..7110200 100644
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -466,7 +466,26 @@ CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_DEFAULT_RENO=y
CONFIG_DEFAULT_TCP_CONG="reno"
# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -552,7 +571,36 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
#
# IP: Netfilter Configuration
@@ -596,6 +644,27 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_IP_NF_MATCH_IPP2P=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -604,6 +673,7 @@ CONFIG_BRIDGE_EBT_802_3=m
CONFIG_BRIDGE_EBT_AMONG=m
CONFIG_BRIDGE_EBT_ARP=m
CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
CONFIG_BRIDGE_EBT_LIMIT=m
CONFIG_BRIDGE_EBT_MARK=m
CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -688,7 +758,7 @@ CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
diff --git a/config/rootfiles/common/cdrtools b/config/rootfiles/common/cdrtools
index 18d19ee..806fb75 100644
--- a/config/rootfiles/common/cdrtools
+++ b/config/rootfiles/common/cdrtools
@@ -73,6 +73,10 @@ usr/bin/mkisofs
#usr/include/schily/i586-linux-cc/align.h
#usr/include/schily/i586-linux-cc/avoffset.h
#usr/include/schily/i586-linux-cc/xconfig.h
+#usr/include/schily/pentium3-linux-cc
+#usr/include/schily/pentium3-linux-cc/align.h
+#usr/include/schily/pentium3-linux-cc/avoffset.h
+#usr/include/schily/pentium3-linux-cc/xconfig.h
#usr/include/schily/iconv.h
#usr/include/schily/idcache.h
#usr/include/schily/intcvt.h
diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index adc8316..7eeea9a 100644
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -4,8 +4,8 @@ boot/config-KVER-ipfire
boot/vmlinuz-KVER-ipfire
boot/vmlinuz-ipfire
etc/modprobe.d/framebuffer
+etc/modprobe.d/ipv6
etc/modprobe.d/isdn
-#lib/firmware/keyspan/usa19qi.fw
lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/build
#lib/modules/KVER-ipfire/kernel
@@ -469,58 +469,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/tsl2550.ko
#lib/modules/KVER-ipfire/kernel/drivers/i2c/i2c-core.ko
#lib/modules/KVER-ipfire/kernel/drivers/i2c/i2c-dev.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide
-#lib/modules/KVER-ipfire/kernel/drivers/ide/aec62xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ali14xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/alim15x3.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/amd74xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/atiixp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cmd640.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cmd64x.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5520.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5530.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5535.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5536.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/delkin_cb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/dtc2278.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/hpt366.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ht6560b.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-cd.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-cs.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-disk.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-generic.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-pci-generic.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-pnp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide_platform.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/it8172.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/it8213.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/it821x.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/jmicron.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ns87415.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/opti621.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pdc202xx_new.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pdc202xx_old.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/piix.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/qd65xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/rz1000.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/sc1200.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/serverworks.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/siimage.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/sis5513.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/slc90e66.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/tc86c001.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/triflex.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/trm290.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/umc8672.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/via82cxxx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/eth1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/ieee1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/ohci1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/pcilynx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/raw1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/sbp2.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/video1394.ko
#lib/modules/KVER-ipfire/kernel/drivers/ieee802154
#lib/modules/KVER-ipfire/kernel/drivers/ieee802154/fakehard.ko
#lib/modules/KVER-ipfire/kernel/drivers/input
@@ -580,17 +528,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divacapi.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divadidd.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/w6692.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax
#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/avma1_cs.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/elsa_cs.ko
@@ -610,10 +547,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdnhdlc.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/icn
#lib/modules/KVER-ipfire/kernel/drivers/isdn/icn/icn.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/pcbit
#lib/modules/KVER-ipfire/kernel/drivers/isdn/pcbit/pcbit.ko
#lib/modules/KVER-ipfire/kernel/drivers/isdn/sc
@@ -1670,6 +1603,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_arpreply.ko
#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_dnat.ko
#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_ip6.ko
#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_limit.ko
#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_log.ko
#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_mark.ko
@@ -1748,6 +1682,36 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/net/ipv4/tcp_yeah.ko
#lib/modules/KVER-ipfire/kernel/net/ipv4/tunnel4.ko
#lib/modules/KVER-ipfire/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ah6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ip6_tunnel.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ipcomp6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ipv6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/mip6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6_queue.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6_tables.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_ah.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_eui64.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_frag.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_hbh.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_rt.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6table_filter.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/sit.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/tunnel6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_beet.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_ro.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_transport.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_tunnel.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_tunnel.ko
#lib/modules/KVER-ipfire/kernel/net/irda
#lib/modules/KVER-ipfire/kernel/net/irda/ircomm
#lib/modules/KVER-ipfire/kernel/net/irda/ircomm/ircomm-tty.ko
@@ -1764,6 +1728,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/net/mac80211
#lib/modules/KVER-ipfire/kernel/net/mac80211/mac80211.ko
#lib/modules/KVER-ipfire/kernel/net/netfilter
+#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs
+#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs.ko
#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack.ko
#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_amanda.ko
#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1860,6 +1826,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/net/sched/cls_fw.ko
#lib/modules/KVER-ipfire/kernel/net/sched/cls_route.ko
#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp6.ko
#lib/modules/KVER-ipfire/kernel/net/sched/cls_tcindex.ko
#lib/modules/KVER-ipfire/kernel/net/sched/cls_u32.ko
#lib/modules/KVER-ipfire/kernel/net/sched/em_cmp.ko
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index 2df45f9..6119966 100644
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -1607,6 +1607,7 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_arpreply.ko
#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_dnat.ko
#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_ip6.ko
#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_limit.ko
#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_log.ko
#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_mark.ko
@@ -1685,6 +1686,36 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_yeah.ko
#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tunnel4.ko
#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ah6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ip6_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ipcomp6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ipv6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/mip6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6_queue.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6_tables.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_ah.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_eui64.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_frag.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_hbh.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_rt.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6table_filter.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/sit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/tunnel6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_beet.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_ro.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_transport.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_tunnel.ko
#lib/modules/KVER-ipfire-pae/kernel/net/irda
#lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm
#lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm/ircomm-tty.ko
@@ -1701,6 +1732,8 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/net/mac80211
#lib/modules/KVER-ipfire-pae/kernel/net/mac80211/mac80211.ko
#lib/modules/KVER-ipfire-pae/kernel/net/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/ipvs
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/ipvs/ip_vs.ko
#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack.ko
#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_amanda.ko
#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1797,6 +1830,7 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_fw.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_route.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_rsvp6.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_tcindex.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_u32.ko
#lib/modules/KVER-ipfire-pae/kernel/net/sched/em_cmp.ko
diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen
index 20a6094..fd2bfe6 100644
--- a/config/rootfiles/packages/linux-xen
+++ b/config/rootfiles/packages/linux-xen
@@ -5,11 +5,6 @@ boot/vmlinuz-KVER-ipfire-xen
boot/vmlinuz-ipfire-xen
#lib/firmware/bnx2x-e1-5.0.21.0.fw
#lib/firmware/bnx2x-e1h-5.0.21.0.fw
-#lib/firmware/keyspan/usa18x.fw
-#lib/firmware/keyspan/usa19.fw
-#lib/firmware/mts_cdma.fw
-#lib/firmware/radeon/RV610_me.bin
-#lib/firmware/ti_5052.fw
#lib/modules
lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/build
@@ -434,53 +429,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/tsl2550.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-dev.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/aec62xx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/alim15x3.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/amd74xx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/atiixp.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cmd640.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cmd64x.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5520.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5530.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5535.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5536.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/delkin_cb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/hpt366.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-cd.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-cs.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-disk.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-generic.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-pci-generic.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-pnp.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide_platform.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it8172.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it8213.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it821x.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/jmicron.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ns87415.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/opti621.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pdc202xx_new.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pdc202xx_old.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/piix.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/rz1000.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/sc1200.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/serverworks.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/siimage.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/sis5513.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/slc90e66.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/tc86c001.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/triflex.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/trm290.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/via82cxxx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/eth1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ieee1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ohci1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/pcilynx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/raw1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/sbp2.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/video1394.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154/fakehard.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input
@@ -535,17 +483,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divacapi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divadidd.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/w6692.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/avma1_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/elsa_cs.ko
@@ -563,10 +500,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/leds
#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/led-class.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-alix2.ko
@@ -1521,6 +1454,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_arpreply.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_dnat.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip6.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_limit.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_log.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_mark.ko
@@ -1599,6 +1533,36 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_yeah.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tunnel4.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ah6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ip6_tunnel.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ipcomp6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ipv6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/mip6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6_queue.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6_tables.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ah.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_eui64.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_frag.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_hbh.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_rt.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_filter.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/sit.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/tunnel6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_beet.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_ro.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_transport.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_tunnel.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_tunnel.ko
#lib/modules/KVER-ipfire-xen/kernel/net/irda
#lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm
#lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm/ircomm-tty.ko
@@ -1615,6 +1579,8 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/mac80211
#lib/modules/KVER-ipfire-xen/kernel/net/mac80211/mac80211.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/ipvs
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/ipvs/ip_vs.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_amanda.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1711,6 +1677,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_fw.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_route.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_rsvp6.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_tcindex.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_u32.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/em_cmp.ko
diff --git a/lfs/linux b/lfs/linux
index 303d62c..0a4d3e6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -189,6 +189,10 @@ ifneq "$(XEN)" "1"
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
done
sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+
+ # Disable ipv6 at runtime
+ echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
+
endif
endif
diff --git a/make.sh b/make.sh
index 1592336..4c7be21 100755
--- a/make.sh
+++ b/make.sh
@@ -40,6 +40,13 @@ GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=1
IPFVER="full" # Which versions should be compiled? (full|devel)
+BUILDMACHINE=$MACHINE
+ if [ "$MACHINE" = "x86_64" ]; then
+ BUILDMACHINE="i686";
+ linux32="linux32";
+ fi
+
+
# Debian specific settings
if [ ! -e /etc/debian_version ]; then
FULLPATH=`which $0`
@@ -227,6 +234,10 @@ prepareenv() {
}
buildtoolchain() {
+ if [ "$MACHINE" = "x86_64" ]; then
+ exiterror "Cannot build toolchain on x86_64. Please use the download."
+ fi
+
LOGFILE="$BASEDIR/log/_build.toolchain.log"
export LOGFILE
ORG_PATH=$PATH
@@ -783,7 +794,6 @@ ipfirepackages() {
case "$1" in
build)
clear
- BUILDMACHINE=`uname -m`
PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
#only restore on a clean disk
if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -911,7 +921,6 @@ toolchain)
prepareenv
beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
buildtoolchain
- BUILDMACHINE=`uname -m`
echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@ -923,7 +932,6 @@ toolchain)
stdumount
;;
gettoolchain)
- BUILDMACHINE=`uname -m`
# arbitrary name to be updated in case of new toolchain package upload
PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
diff --git a/tools/make-functions b/tools/make-functions
index 4bf4140..530cd47 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -363,7 +363,7 @@ lfsmake2() {
[ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
- chroot $LFS /tools/bin/env -i HOME=/root \
+ $linux32 chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
VERSION=$VERSION \
@@ -394,7 +394,7 @@ ipfiremake() {
[ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
- chroot $LFS /tools/bin/env -i HOME=/root \
+ $linux32 chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
VERSION=$VERSION \
@@ -456,7 +456,7 @@ installmake() {
[ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
- chroot $LFS /tools/bin/env -i HOME=/root \
+ $linux32 chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
VERSION=$VERSION \
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 499bc000ffd5e65325d1fa9bbf7e1085b62eaea3
by gitï¼ ipfire.org 08 Nov '10
by gitï¼ ipfire.org 08 Nov '10
08 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 499bc000ffd5e65325d1fa9bbf7e1085b62eaea3 (commit)
via 324cae81712b7b1b7b80333ad92e369cac28b6ce (commit)
from 3bb552552806066293fcfbedb8a41458393cfcd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 499bc000ffd5e65325d1fa9bbf7e1085b62eaea3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Sep 15 17:40:35 2010 +0200
Updated hostapd (0.7.3).
commit 324cae81712b7b1b7b80333ad92e369cac28b6ce
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Nov 8 20:33:26 2010 +0100
wlanap.cgi: changed txpower to textfield if driver is not madwifi.
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/wlanap.cgi | 14 ++++++++++----
lfs/hostapd | 6 +++---
2 files changed, 13 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 0301895..cd5bda3 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -371,14 +371,20 @@ foreach $channel (@channellist){
print <<END
</select></td></tr>
-<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'><select name='TXPOWER'>
+<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'>
END
;
-foreach $txpower (@txpower){
- print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm";
+
+if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
+ print "<select name='TXPOWER'>";
+ foreach $txpower (@txpower){
+ print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm";
+ }
+ print " </select></td></tr>";
+} else {
+ print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
}
print <<END
- </select></td></tr>
<tr><td width='25%' class='base'>Passphrase: </td><td class='base' colspan='3'><input type='text' name='PWD' size='63' value='$wlanapsettings{'PWD'}' /></td></tr>
<tr><td width='25%' class='base'>HT Caps: </td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='63' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
<tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'>
diff --git a/lfs/hostapd b/lfs/hostapd
index 90b35db..57d511a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
include Config
-VER = 0.7.2
+VER = 0.7.3
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 19
+PAK_VER = 20
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f47689c62ee8c1c59989b402d4f130c3
+$(DL_FILE)_MD5 = 91a7c8d0f090b7104152d3455a84c112
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. eee6bb52534a63a9af166857a087afaf60a98a6d
by gitï¼ ipfire.org 07 Nov '10
by gitï¼ ipfire.org 07 Nov '10
07 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via eee6bb52534a63a9af166857a087afaf60a98a6d (commit)
via 8dce07fcc91d3e7fb30e10500c2df314c3d93000 (commit)
via f0a80f0d080077f922f7e9847b52dc194378b6c9 (commit)
via 6b7e3f4f0159e3ccb16f77bb7e17cb49ef09a8fe (commit)
via b9a6b19e5f1cb302c407ee5202d5ed205d027e07 (commit)
via 2d922811ccaee8ddf021ed16ac4637030d0aef08 (commit)
via 2777fcb0e4b6a726d27c54615369ddc94b0ec778 (commit)
via 5f157e9dde2cf9bb435f7dd4f015ff2fa9346095 (commit)
via 81cbd283244759b9bc019b0d1b520fe3a1f6d211 (commit)
via a35376e587393d526a3de4ece885a6a6d4916da5 (commit)
via 229d01e27091264c44a2e1db8898fd2b306fa442 (commit)
via 83dc82d564b65b62ca5bc5bab43af557a24fadbc (commit)
via 3002f9ae1b61e4f4802bc1aa4089ae7a2cec6751 (commit)
via 72e67668bc7120366912d3b5c74503c0460f2e84 (commit)
via 92409c7bd1a04ba3221ec7a803353e902c89fdc0 (commit)
via b7b53e02d9078b0d73961108c93f661cfa56fc6a (commit)
via 4752018936993068a7a1b0b0e193fe14db085707 (commit)
via 6ed30ec4f20c41b0d694f0d2272dc4462c542e3d (commit)
from c6fb66f9566951124ccd66f1592f87c3ec60ca85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eee6bb52534a63a9af166857a087afaf60a98a6d
Merge: 8dce07f b9a6b19
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 7 14:12:55 2010 +0100
Merge branch 'selinux' into next
commit 8dce07fcc91d3e7fb30e10500c2df314c3d93000
Merge: f0a80f0 6b7e3f4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 23:14:47 2010 +0100
Merge remote branch 'stevee/netplugd' into netplugd
commit f0a80f0d080077f922f7e9847b52dc194378b6c9
Merge: 92409c7 c6fb66f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 23:14:33 2010 +0100
Merge branch 'next' into netplugd
commit 6b7e3f4f0159e3ccb16f77bb7e17cb49ef09a8fe
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 22:22:25 2010 +0100
netplugd: Add upstart jobfile.
Refers to #87.
commit b9a6b19e5f1cb302c407ee5202d5ed205d027e07
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 21:54:45 2010 +0100
python: Enable support for selinux.
commit 2d922811ccaee8ddf021ed16ac4637030d0aef08
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 21:27:52 2010 +0100
tar: Enable support for selinux.
commit 2777fcb0e4b6a726d27c54615369ddc94b0ec778
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 21:07:45 2010 +0100
glibc: Enable support for selinux.
commit 5f157e9dde2cf9bb435f7dd4f015ff2fa9346095
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 20:23:22 2010 +0100
shadow: Enable support for selinux.
commit 81cbd283244759b9bc019b0d1b520fe3a1f6d211
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 20:15:51 2010 +0100
passwd: Enable support for selinux.
commit a35376e587393d526a3de4ece885a6a6d4916da5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 20:10:42 2010 +0100
coreutils: Enable support for selinux.
commit 229d01e27091264c44a2e1db8898fd2b306fa442
Merge: 83dc82d 3002f9a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 19:42:28 2010 +0100
Merge remote branch 'stevee/selinux' into selinux
commit 83dc82d564b65b62ca5bc5bab43af557a24fadbc
Merge: 6ed30ec 1e2914a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 19:42:22 2010 +0100
Merge branch 'next' into selinux
commit 3002f9ae1b61e4f4802bc1aa4089ae7a2cec6751
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 19:15:08 2010 +0100
libsemanage: New package.
commit 72e67668bc7120366912d3b5c74503c0460f2e84
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 19:14:49 2010 +0100
libselinux: New package.
commit 92409c7bd1a04ba3221ec7a803353e902c89fdc0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 18:43:28 2010 +0100
netplug: New package.
References #87.
commit b7b53e02d9078b0d73961108c93f661cfa56fc6a
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 19:14:33 2010 +0100
libsepol: New package.
commit 4752018936993068a7a1b0b0e193fe14db085707
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 19:13:58 2010 +0100
ustr: New package.
commit 6ed30ec4f20c41b0d694f0d2272dc4462c542e3d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 5 23:39:36 2010 +0100
kernel: Enable support for SELinux.
-----------------------------------------------------------------------
Summary of changes:
pkgs/core/coreutils/coreutils.nm | 4 +-
pkgs/core/glibc/glibc.nm | 6 +-
pkgs/core/kernel/config | 17 ++-
pkgs/core/kernel/kernel.nm | 2 +-
pkgs/core/libselinux/libselinux.nm | 94 +++++++++
.../libselinux/patches/libselinux-ipfire.patch | 12 ++
.../libaio.nm => libsemanage/libsemanage.nm} | 47 +++--
.../libsemanage/patches/libsemanage-rhat.patch | 24 +++
pkgs/core/libsemanage/semanage.conf | 48 +++++
.../libcap-ng.nm => libsepol/libsepol.nm} | 32 ++--
pkgs/core/{pptp/pptp.nm => netplug/netplug.nm} | 34 ++--
.../{lldpd/lldpd.init => netplug/netplugd.init} | 4 +-
.../patches/netplug-1.2.9.1-execshield.patch | 203 ++++++++++++++++++++
pkgs/core/passwd/passwd.nm | 13 +-
pkgs/core/python/python.nm | 6 +-
pkgs/core/shadow/shadow.nm | 6 +-
pkgs/core/tar/tar.nm | 4 +-
pkgs/core/{libssh2/libssh2.nm => ustr/ustr.nm} | 42 +++--
18 files changed, 504 insertions(+), 94 deletions(-)
create mode 100644 pkgs/core/libselinux/libselinux.nm
create mode 100644 pkgs/core/libselinux/patches/libselinux-ipfire.patch
copy pkgs/core/{libaio/libaio.nm => libsemanage/libsemanage.nm} (63%)
create mode 100644 pkgs/core/libsemanage/patches/libsemanage-rhat.patch
create mode 100644 pkgs/core/libsemanage/semanage.conf
copy pkgs/core/{libcap-ng/libcap-ng.nm => libsepol/libsepol.nm} (77%)
copy pkgs/core/{pptp/pptp.nm => netplug/netplug.nm} (72%)
copy pkgs/core/{lldpd/lldpd.init => netplug/netplugd.init} (56%)
create mode 100644 pkgs/core/netplug/patches/netplug-1.2.9.1-execshield.patch
copy pkgs/core/{libssh2/libssh2.nm => ustr/ustr.nm} (74%)
Difference in files:
diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm
index 6b82169..b4972ee 100644
--- a/pkgs/core/coreutils/coreutils.nm
+++ b/pkgs/core/coreutils/coreutils.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = coreutils
PKG_VER = 8.5
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUP = System/Base
@@ -40,7 +40,7 @@ define PKG_DESCRIPTION
endef
PKG_BUILD_DEPS+= autoconf automake libacl-devel libattr-devel libcap \
- ncurses-devel e2fsprogs pam-devel
+ ncurses-devel e2fsprogs pam-devel libselinux-devel
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 4bbaacd..3d0e561 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = glibc
PKG_VER = 2.12.1
-PKG_REL = 2
+PKG_REL = 3
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUP = System/Base
@@ -34,6 +34,8 @@ PKG_URL = http://sources.redhat.com/glibc/
PKG_LICENSE = GPLv2+ LGPLv2+
PKG_SUMMARY = The GNU libc libraries.
+PKG_BUILD_DEPS+= autoconf automake gettext libselinux-devel texinfo
+
PKG_PACKAGES += $(PKG_NAME_REAL)-devel
define PKG_DESCRIPTION
@@ -226,7 +228,7 @@ define STAGE_BUILD
--disable-profile \
--enable-add-ons \
--enable-kernel=$(OPTIMIZED_KERNEL) \
- --without-selinux \
+ --with-selinux \
--disable-werror \
--enable-bind-now \
--enable-stackguard-randomization \
diff --git a/pkgs/core/kernel/config b/pkgs/core/kernel/config
index e3bbd99..b0fee45 100644
--- a/pkgs/core/kernel/config
+++ b/pkgs/core/kernel/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.4
-# Sat Sep 18 18:55:00 2010
+# Fri Nov 5 20:40:34 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -620,7 +620,7 @@ CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
CONFIG_IPV6_PIMSM_V2=y
# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
@@ -635,6 +635,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CT_PROTO_DCCP=m
@@ -665,6 +666,7 @@ CONFIG_NETFILTER_XT_CONNMARK=m
#
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
@@ -677,6 +679,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -3837,7 +3840,15 @@ CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
# CONFIG_SECURITY_PATH is not set
CONFIG_INTEL_TXT=y
-# CONFIG_SECURITY_SELINUX is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
# CONFIG_SECURITY_TOMOYO is not set
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
diff --git a/pkgs/core/kernel/kernel.nm b/pkgs/core/kernel/kernel.nm
index be7887b..b615986 100644
--- a/pkgs/core/kernel/kernel.nm
+++ b/pkgs/core/kernel/kernel.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = linux
PKG_VER = 2.6.35.4
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUP = System/Kernels
diff --git a/pkgs/core/libselinux/libselinux.nm b/pkgs/core/libselinux/libselinux.nm
new file mode 100644
index 0000000..03e418d
--- /dev/null
+++ b/pkgs/core/libselinux/libselinux.nm
@@ -0,0 +1,94 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = libselinux
+PKG_VER = 2.0.96
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.selinuxproject.org
+PKG_LICENSE = Public Domain
+PKG_SUMMARY = SELinux library and simple utilities.
+
+PKG_BUILD_DEPS+= libsepol-devel python-devel swig
+
+define PKG_DESCRIPTION
+ libselinux provides an API for SELinux applications to get and set \
+ process and file security contexts and to obtain security policy \
+ decisions.
+endef
+
+PKG_TARBALL = $(THISAPP).tgz
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils python-selinux
+
+# Package information for libselinux-utils
+PKG_SUMMARY-$(PKG_NAME_REAL)-utils = SELinux libselinux utilies.
+PKG_DESCRIPTION-$(PKG_NAME_REAL)-utils = The libselinux-utils package contains the utilities.
+
+define PKG_FILES-$(PKG_NAME_REAL)-utils
+ /usr/sbin/*
+ /usr/share/man/man5/*
+ /usr/share/man/man8/*
+endef
+
+# Package information for python-selinux
+PKG_SUMMARY-python-selinux = SELinux python bindings.
+PKG_DESCRIPTION-selinux = SELinux python bindings for libselinux.
+
+define PKG_FILES-python-selinux
+ /usr/lib/python*
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make clean
+ cd $(DIR_APP) && make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g $(CFLAGS)" swigify
+ cd $(DIR_APP) && make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g $(CFLAGS)" all
+ cd $(DIR_APP) && make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g $(CFLAGS)" pywrap
+endef
+
+define STAGE_INSTALL_CMDS
+ cd $(DIR_APP) && make install-pywrap DESTDIR=$(BUILDROOT)
+
+ # Remove unwanted binaries
+ rm -f $(BUILDROOT)/usr/sbin/compute_*
+ rm -f $(BUILDROOT)/usr/sbin/deftype
+ rm -f $(BUILDROOT)/usr/sbin/execcon
+ rm -f $(BUILDROOT)/usr/sbin/getenforcemode
+ rm -f $(BUILDROOT)/usr/sbin/getfilecon
+ rm -f $(BUILDROOT)/usr/sbin/getpidcon
+ rm -f $(BUILDROOT)/usr/sbin/mkdircon
+ rm -f $(BUILDROOT)/usr/sbin/policyvers
+ rm -f $(BUILDROOT)/usr/sbin/setfilecon
+ rm -f $(BUILDROOT)/usr/sbin/selinuxconfig
+ rm -f $(BUILDROOT)/usr/sbin/selinuxdisable
+ rm -f $(BUILDROOT)/usr/sbin/getseuser
+ rm -f $(BUILDROOT)/usr/sbin/selinux_check_securetty_context
+
+ # Move binaries from /sbin to /usr/sbin
+ mv $(BUILDROOT)/sbin/* $(BUILDROOT)/usr/sbin
+endef
diff --git a/pkgs/core/libselinux/patches/libselinux-ipfire.patch b/pkgs/core/libselinux/patches/libselinux-ipfire.patch
new file mode 100644
index 0000000..29e0eef
--- /dev/null
+++ b/pkgs/core/libselinux/patches/libselinux-ipfire.patch
@@ -0,0 +1,12 @@
+diff -Nur a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2010-11-06 13:49:19.000000000 +0100
++++ b/src/Makefile 2010-06-16 14:03:39.000000000 +0200
+@@ -95,7 +95,7 @@
+ $(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+
+ $(AUDIT2WHYSO): audit2why.lo
+- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux ${LIBDIR}/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -lsepol -L$(LIBDIR) -Wl,-soname,$@
+
+ %.o: %.c policy.h
+ $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
diff --git a/pkgs/core/libsemanage/libsemanage.nm b/pkgs/core/libsemanage/libsemanage.nm
new file mode 100644
index 0000000..c3438e9
--- /dev/null
+++ b/pkgs/core/libsemanage/libsemanage.nm
@@ -0,0 +1,69 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = libsemanage
+PKG_VER = 2.0.45
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.selinuxproject.org
+PKG_LICENSE = LGPLv2+
+PKG_SUMMARY = SELinux binary policy manipulation library.
+
+PKG_BUILD_DEPS+= bison flex libselinux-devel libsepol-devel \
+ python-devel swig ustr-devel
+
+define PKG_DESCRIPTION
+ libsemanage provides an API for the manipulation of SELinux \
+ binary policies.
+endef
+
+PKG_TARBALL = $(THISAPP).tgz
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel python-selinux-manage
+
+# Package information for python-selinux-manage
+PKG_SUMMARY-python-selinux-manage = SELinux manage python bindings.
+PKG_DESCRIPTION-selinux-manage = SELinux python bindings for libsemanage.
+
+define PKG_FILES-python-selinux-manage
+ /usr/lib/python*
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make clean
+ cd $(DIR_APP) && make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g $(CFLAGS)" swigify
+ cd $(DIR_APP) && make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g $(CFLAGS)" all
+ cd $(DIR_APP) && make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g $(CFLAGS)" pywrap
+endef
+
+define STAGE_INSTALL_CMDS
+ cd $(DIR_APP) && make install-pywrap DESTDIR=$(BUILDROOT)
+
+ # Install our config file
+ cp -vf $(DIR_SOURCE)/semanage.conf $(BUILDROOT)/etc/selinux/semanage.conf
+endef
diff --git a/pkgs/core/libsemanage/patches/libsemanage-rhat.patch b/pkgs/core/libsemanage/patches/libsemanage-rhat.patch
new file mode 100644
index 0000000..a1f53c5
--- /dev/null
+++ b/pkgs/core/libsemanage/patches/libsemanage-rhat.patch
@@ -0,0 +1,24 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.44/src/genhomedircon.c
+--- nsalibsemanage/src/genhomedircon.c 2009-09-17 08:59:43.000000000 -0400
++++ libsemanage-2.0.44/src/genhomedircon.c 2010-02-24 14:57:23.000000000 -0500
+@@ -310,6 +310,10 @@
+ }
+ if (strcmp(pwbuf->pw_dir, "/") == 0)
+ continue;
++ if (strcmp(pwbuf->pw_dir, "/root") == 0) {
++ continue;
++ }
++
+ if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
+ continue;
+ if (!(path = strdup(pwbuf->pw_dir))) {
+@@ -803,6 +807,9 @@
+ * /root */
+ continue;
+ }
++ if (strcmp(pwent->pw_dir, "/root") == 0) {
++ continue;
++ }
+ if (push_user_entry(&head, name, seuname,
+ prefix, pwent->pw_dir) != STATUS_SUCCESS) {
+ *errors = STATUS_ERR;
diff --git a/pkgs/core/libsemanage/semanage.conf b/pkgs/core/libsemanage/semanage.conf
new file mode 100644
index 0000000..d2f9c59
--- /dev/null
+++ b/pkgs/core/libsemanage/semanage.conf
@@ -0,0 +1,48 @@
+# Authors: Jason Tang <jtang(a)tresys.com>
+#
+# Copyright (C) 2004-2005 Tresys Technology, LLC
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Specify how libsemanage will interact with a SELinux policy manager.
+# The four options are:
+#
+# "source" - libsemanage manipulates a source SELinux policy
+# "direct" - libsemanage will write directly to a module store.
+# /foo/bar - Write by way of a policy management server, whose
+# named socket is at /foo/bar. The path must begin
+# with a '/'.
+# foo.com:4242 - Establish a TCP connection to a remote policy
+# management server at foo.com. If there is a colon
+# then the remainder is interpreted as a port number;
+# otherwise default to port 4242.
+module-store = direct
+
+# When generating the final linked and expanded policy, by default
+# semanage will set the policy version to POLICYDB_VERSION_MAX, as
+# given in <sepol/policydb.h>. Change this setting if a different
+# version is necessary.
+#policy-version = 19
+
+# expand-check check neverallow rules when executing all semanage commands.
+# Large penalty in time if you turn this on.
+expand-check=0
+
+# usepasswd check tells semanage to scan all pass word records for home directories
+# and setup the labeling correctly. If this is turned off, SELinux will label /home
+# correctly only. You will need to use semanage fcontext command.
+# For example, if you had home dirs in /althome directory you would have to execute
+# semanage fcontext -a -e /home /althome
+usepasswd=False
diff --git a/pkgs/core/libsepol/libsepol.nm b/pkgs/core/libsepol/libsepol.nm
new file mode 100644
index 0000000..d27fd7b
--- /dev/null
+++ b/pkgs/core/libsepol/libsepol.nm
@@ -0,0 +1,57 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = libsepol
+PKG_VER = 2.0.41
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.selinuxproject.org
+PKG_LICENSE = LGPLv2+
+PKG_SUMMARY = SELinux binary policy manipulation library.
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel
+
+define PKG_DESCRIPTION
+ libsepol provides an API for the manipulation of SELinux binary \
+ policies.
+endef
+
+PKG_TARBALL = $(THISAPP).tgz
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make clean
+ cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(PARALELLISMFLAGS)
+endef
+
+define STAGE_INSTALL_CMDS
+ # Remove binaries
+ rm -rf $(BUILDROOT)/usr/bin
+
+ # Remove manpages from binaries
+ rm -rf $(BUILDROOT)/usr/share/man/man8
+endef
diff --git a/pkgs/core/netplug/netplug.nm b/pkgs/core/netplug/netplug.nm
new file mode 100644
index 0000000..e1bc02c
--- /dev/null
+++ b/pkgs/core/netplug/netplug.nm
@@ -0,0 +1,59 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = netplug
+PKG_VER = 1.2.9.1
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = Networking/Tools
+PKG_URL = http://www.red-bean.com/~bos/
+PKG_LICENSE = GPLv2
+PKG_SUMMARY = A daemon that manages network interfaces in response to \
+ network cables being plugged in and out.
+
+define PKG_DESCRIPTION
+ Netplug is a Linux daemon that manages network interfaces in response \
+ to network cables being plugged in and out. If you're familiar with \
+ Windows XP, which just does the Right Thing when you plug an ethernet \
+ cable into a laptop, netplug will need no further explanation.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.bz2
+
+define STAGE_PREPARE_CMDS
+ # Remove debugging flags from CFLAGS.
+ cd $(DIR_APP) && sed -i Makefile \
+ -e "s/-ggdb3 -O3//g"
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make CC="gcc"
+endef
+
+define STAGE_INSTALL_CMDS
+ rm -rfv $(BUILDROOT)/etc/rc.d
+endef
diff --git a/pkgs/core/netplug/netplugd.init b/pkgs/core/netplug/netplugd.init
new file mode 100644
index 0000000..3f9fef4
--- /dev/null
+++ b/pkgs/core/netplug/netplugd.init
@@ -0,0 +1,8 @@
+description "Starts the netplug daemon"
+author "IPFire Team"
+
+start on started network
+stop on stopping network
+
+exec /sbin/netplugd -F
+respawn
diff --git a/pkgs/core/netplug/patches/netplug-1.2.9.1-execshield.patch b/pkgs/core/netplug/patches/netplug-1.2.9.1-execshield.patch
new file mode 100644
index 0000000..b9809f1
--- /dev/null
+++ b/pkgs/core/netplug/patches/netplug-1.2.9.1-execshield.patch
@@ -0,0 +1,203 @@
+diff -up netplug-1.2.9.1/if_info.c.execshield netplug-1.2.9.1/if_info.c
+--- netplug-1.2.9.1/if_info.c.execshield 2008-12-23 00:36:23.000000000 +0100
++++ netplug-1.2.9.1/if_info.c 2009-09-09 10:02:12.000000000 +0200
+@@ -95,15 +95,16 @@ flags_str(char *buf, unsigned int fl)
+ return buf;
+ }
+
+-void
+-for_each_iface(int (*func)(struct if_info *))
++struct if_info *
++for_each_iface(int (*func)(struct if_info *, long), long param)
+ {
+ for(int i = 0; i < INFOHASHSZ; i++) {
+ for(struct if_info *info = if_info[i]; info != NULL; info = info->next) {
+- if ((*func)(info))
+- return;
++ if ((*func)(info, param))
++ return info;
+ }
+ }
++ return NULL;
+ }
+
+ /* Reevaluate the state machine based on the current state and flag settings */
+@@ -285,22 +286,20 @@ ifsm_flagchange(struct if_info *info, un
+ }
+
+ /* handle a script termination and update the state accordingly */
++int find_pid(struct if_info *i, long param) {
++ if (i->worker == param) {
++ return 1;
++ }
++ return 0;
++}
++
+ void ifsm_scriptdone(pid_t pid, int exitstatus)
+ {
+ int exitok = WIFEXITED(exitstatus) && WEXITSTATUS(exitstatus) == 0;
+ struct if_info *info;
+ assert(WIFEXITED(exitstatus) || WIFSIGNALED(exitstatus));
+
+- int find_pid(struct if_info *i) {
+- if (i->worker == pid) {
+- info = i;
+- return 1;
+- }
+- return 0;
+- }
+-
+- info = NULL;
+- for_each_iface(find_pid);
++ info = for_each_iface(find_pid, pid);
+
+ if (info == NULL) {
+ do_log(LOG_INFO, "Unexpected child %d exited with status %d",
+diff -up netplug-1.2.9.1/main.c.execshield netplug-1.2.9.1/main.c
+--- netplug-1.2.9.1/main.c.execshield 2008-12-23 00:36:23.000000000 +0100
++++ netplug-1.2.9.1/main.c 2009-09-09 10:02:12.000000000 +0200
+@@ -161,11 +161,28 @@ child_handler(int sig, siginfo_t *info,
+ ce.pid = info->si_pid;
+ ret = waitpid(info->si_pid, &ce.status, 0);
+ if (ret == info->si_pid)
+- write(child_handler_pipe[1], &ce, sizeof(ce));
++ (void)write(child_handler_pipe[1], &ce, sizeof(ce));
+ }
+
+ /* Poll the existing interface state, so we can catch any state
+ changes for which we may not have neen a netlink message. */
++static int pollflags(struct if_info *info, long param) {
++ struct ifreq ifr;
++
++ if (!if_match(info->name))
++ return 0;
++
++ memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name));
++ if (ioctl(param, SIOCGIFFLAGS, &ifr) < 0)
++ do_log(LOG_ERR, "%s: can't get flags: %m", info->name);
++ else {
++ ifsm_flagchange(info, ifr.ifr_flags);
++ ifsm_flagpoll(info);
++ }
++
++ return 0;
++}
++
+ static void
+ poll_interfaces(void)
+ {
+@@ -180,24 +197,13 @@ poll_interfaces(void)
+ close_on_exec(sockfd);
+ }
+
+- int pollflags(struct if_info *info) {
+- struct ifreq ifr;
+-
+- if (!if_match(info->name))
+- return 0;
+-
+- memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name));
+- if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
+- do_log(LOG_ERR, "%s: can't get flags: %m", info->name);
+- else {
+- ifsm_flagchange(info, ifr.ifr_flags);
+- ifsm_flagpoll(info);
+- }
+-
+- return 0;
+- }
++ for_each_iface(pollflags, sockfd);
++}
+
+- for_each_iface(pollflags);
++static int poll_flags(struct if_info *i, long param) {
++ if (if_match(i->name))
++ ifsm_flagpoll(i);
++ return 0;
+ }
+
+ int debug = 0;
+@@ -331,17 +337,11 @@ main(int argc, char *argv[])
+ { child_handler_pipe[0], POLLIN, 0 },
+ };
+
+- {
+- /* Run over each of the interfaces we know and care about, and
+- make sure the state machine has done the appropriate thing
+- for their current state. */
+- int poll_flags(struct if_info *i) {
+- if (if_match(i->name))
+- ifsm_flagpoll(i);
+- return 0;
+- }
+- for_each_iface(poll_flags);
+- }
++ /* Run over each of the interfaces we know and care about, and
++ make sure the state machine has done the appropriate thing
++ for their current state. */
++ for_each_iface(poll_flags, 0);
++
+
+ for(;;) {
+ int ret;
+diff -up netplug-1.2.9.1/Makefile.execshield netplug-1.2.9.1/Makefile
+--- netplug-1.2.9.1/Makefile.execshield 2008-12-23 00:41:38.000000000 +0100
++++ netplug-1.2.9.1/Makefile 2009-09-09 10:02:12.000000000 +0200
+@@ -4,15 +4,15 @@ DESTDIR ?=
+
+ prefix ?=
+ bindir ?= $(prefix)/sbin
+-etcdir ?= $(prefix)/etc/netplug
++etcdir ?= $(prefix)/etc/netplug.d
+ initdir ?= $(prefix)/etc/rc.d/init.d
+ scriptdir ?= $(prefix)/etc/netplug.d
+ mandir ?= $(prefix)/usr/share/man
+
+ install_opts :=
+
+-CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
+- -DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"'
++CFLAGS += -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
++ -DNP_SCRIPT_DIR='"$(scriptdir)"' -DNP_VERSION='"$(version)"'
+
+ netplugd: config.o netlink.o lib.o if_info.o main.o
+ $(CC) $(LDFLAGS) -o $@ $^
+@@ -30,10 +30,12 @@ install:
+ install $(install_opts) -m 755 scripts/rc.netplugd $(DESTDIR)/$(initdir)/netplugd
+ install $(install_opts) -m 444 man/man8/netplugd.8 $(DESTDIR)/$(mandir)/man8
+
+-hg_root := $(shell hg root)
++#hg_root := $(shell hg root)
++hg_root := $(shell)
+ tar_root := netplug-$(version)
+ tar_file := $(hg_root)/$(tar_root).tar.bz2
+-files := $(shell hg manifest)
++#files := $(shell hg manifest)
++files := $(shell)
+
+ tarball: $(tar_file)
+
+diff -up netplug-1.2.9.1/man/man8/netplugd.8.execshield netplug-1.2.9.1/man/man8/netplugd.8
+--- netplug-1.2.9.1/man/man8/netplugd.8.execshield 2008-12-23 00:36:23.000000000 +0100
++++ netplug-1.2.9.1/man/man8/netplugd.8 2009-09-09 10:07:33.000000000 +0200
+@@ -134,7 +134,7 @@ to run in the foreground, this option is
+ .\"
+ .Sh FILES
+ .Bl -tag -width Ds
+-.It Pa /etc/netplug/netplugd.conf
++.It Pa /etc/netplug.d/netplugd.conf
+ Default config file to read, if none is specified on the command line.
+ The config file format is one pattern per line, with white space,
+ empty lines, and comments starting with a
+diff -up netplug-1.2.9.1/netplug.h.execshield netplug-1.2.9.1/netplug.h
+--- netplug-1.2.9.1/netplug.h.execshield 2008-12-23 00:36:23.000000000 +0100
++++ netplug-1.2.9.1/netplug.h 2009-09-09 10:02:12.000000000 +0200
+@@ -83,7 +83,7 @@ struct if_info *if_info_update_interface
+ struct rtattr *attrs[]);
+ int if_info_save_interface(struct nlmsghdr *hdr, void *arg);
+ void parse_rtattrs(struct rtattr *tb[], int max, struct rtattr *rta, int len);
+-void for_each_iface(int (*func)(struct if_info *));
++struct if_info *for_each_iface(int (*func)(struct if_info *, long), long param);
+
+ void ifsm_flagpoll(struct if_info *info);
+ void ifsm_flagchange(struct if_info *info, unsigned int newflags);
diff --git a/pkgs/core/passwd/passwd.nm b/pkgs/core/passwd/passwd.nm
index 4bb782d..a6a2919 100644
--- a/pkgs/core/passwd/passwd.nm
+++ b/pkgs/core/passwd/passwd.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = passwd
PKG_VER = 0.76
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = System/Base
@@ -34,7 +34,8 @@ PKG_URL = http://fedorahosted.org/passwd
PKG_LICENSE = BSD
PKG_SUMMARY = An utility for setting or changing passwords using PAM.
-PKG_DEPS += glib2 libuser pam
+PKG_BUILD_DEPS+= audit-devel glib2-devel libuser-devel pam-devel pkg-config \
+ libselinux-devel
define PKG_DESCRIPTION
This package contains a system utility (passwd) which sets \
@@ -44,16 +45,12 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-###############################################################################
-# Installation Details
-###############################################################################
-
define STAGE_BUILD
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
- --without-selinux \
- --without-audit \
+ --with-selinux \
+ --with-audit \
--disable-static
cd $(DIR_APP) && make DEBUG= RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLELISMFLAGS)
diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm
index a6875c8..c8374e5 100644
--- a/pkgs/core/python/python.nm
+++ b/pkgs/core/python/python.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = Python
PKG_VER = 2.7
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUP = Development/Languages
@@ -35,8 +35,8 @@ PKG_LICENSE = Python
PKG_SUMMARY = An interpreted, interactive, object-oriented programming language.
PKG_BUILD_DEPS+= autoconf automake bzip2-devel db-devel expat-devel gdbm-devel \
- libffi-devel ncurses-devel openssl-devel pkg-config readline-devel sqlite-devel \
- tar zlib-devel
+ libffi-devel libselinux-devel ncurses-devel openssl-devel pkg-config \
+ readline-devel sqlite-devel tar zlib-devel
define PKG_DESCRIPTION
Python is an interpreted, interactive, object-oriented programming \
diff --git a/pkgs/core/shadow/shadow.nm b/pkgs/core/shadow/shadow.nm
index 022e6b5..d7ec1ed 100644
--- a/pkgs/core/shadow/shadow.nm
+++ b/pkgs/core/shadow/shadow.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = shadow
PKG_VER = 4.1.4.2
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUP = System/Base
@@ -34,7 +34,7 @@ PKG_URL = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities to deal with user accounts.
-PKG_BUILD_DEPS+= libcap
+PKG_BUILD_DEPS+= audit-devel libcap-devel libselinux-devel
define PKG_DESCRIPTION
The shadow-utils package includes the necessary programs \
@@ -48,7 +48,7 @@ CONFIGURE_OPTIONS += \
--sysconfdir=/etc \
--enable-shadowgrp \
--with-sha-crypt \
- --without-selinux \
+ --with-selinux \
--without-libcrack \
--without-libpam \
--disable-static
diff --git a/pkgs/core/tar/tar.nm b/pkgs/core/tar/tar.nm
index 2706ebe..853a223 100644
--- a/pkgs/core/tar/tar.nm
+++ b/pkgs/core/tar/tar.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = tar
PKG_VER = 1.23
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = System/Packaging
@@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/tar/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A GNU file archiving program.
-PKG_BUILD_DEPS+= autoconf automake libacl-devel libattr-devel
+PKG_BUILD_DEPS+= autoconf automake libacl-devel libattr-devel libselinux-devel
define PKG_DESCRIPTION
The GNU tar program saves many files together in one archive \
diff --git a/pkgs/core/ustr/ustr.nm b/pkgs/core/ustr/ustr.nm
new file mode 100644
index 0000000..2d0997b
--- /dev/null
+++ b/pkgs/core/ustr/ustr.nm
@@ -0,0 +1,68 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = ustr
+PKG_VER = 1.0.4
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.and.org/ustr/
+PKG_LICENSE = MIT or LGPLv2+ or BSD
+PKG_SUMMARY = String library, very low memory overhead, simple to import.
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel
+
+define PKG_DESCRIPTION
+ Micro string library, with very low overhead.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.bz2
+
+define PKG_FILES-$(PKG_NAME_REAL)-devel
+ /usr/bin
+ /usr/include
+ /usr/lib/pkgconfig
+ */lib/*.so
+endef
+
+
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make all-shared CFLAGS="$(CFLAGS)" $(PARALELLISMFLAGS)
+endef
+
+define STAGE_TEST
+ cd $(DIR_APP) && make check
+endef
+
+define STAGE_INSTALL_CMDS
+ rm -rf $(BUILDROOT)/usr/share
+ rm -rf $(BUILDROOT)/usr/lib/pkgconfig/*debug*
+ rm -rf $(BUILDROOT)/lib/*debug*
+ rm -rf $(BUILDROOT)/usr/lib/*debug*
+endef
+
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3bb552552806066293fcfbedb8a41458393cfcd0
by gitï¼ ipfire.org 07 Nov '10
by gitï¼ ipfire.org 07 Nov '10
07 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 3bb552552806066293fcfbedb8a41458393cfcd0 (commit)
via bab14e7ee263c0d19028130061b8376f7ed17fbc (commit)
from 83db6800ddea7be6553fb9fd3ee8f4641f1f69f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3bb552552806066293fcfbedb8a41458393cfcd0
Merge: bab14e7 83db680
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 7 15:40:36 2010 +0100
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
commit bab14e7ee263c0d19028130061b8376f7ed17fbc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 7 15:38:06 2010 +0100
IPFireseeder: updated for core41.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/ipfireseeder | 2 +-
lfs/ipfireseeder | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index bacd4dd..e67f850 100644
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
etc/rc.d/init.d/ipfireseeder
#var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core41.iso.torrent
#var/log/seeder
var/log/seeder/info
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index b2a65ca..7d7a3c2 100644
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
-DL_FILE = ipfire-2.7.i586-full-core40.iso.torrent
+DL_FILE = ipfire-2.7.i586-full-core41.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
-PAK_VER = 15
+PAK_VER = 16
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6475e2d772a39db73ea869328f98d2f3
+$(DL_FILE)_MD5 = de05c43a1bc513eae06f16fcc2a8f94b
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c6fb66f9566951124ccd66f1592f87c3ec60ca85
by gitï¼ ipfire.org 06 Nov '10
by gitï¼ ipfire.org 06 Nov '10
06 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via c6fb66f9566951124ccd66f1592f87c3ec60ca85 (commit)
via ba3c038fa9aba1fe310868ec934ea426409fa27c (commit)
via 1e2914a72a796552ef9320fcd6d23ca0315fbc65 (commit)
via f8cd422890c02cb2a6847b0cf905030b2f414eb3 (commit)
via e882664cd36ac19040a8201b16debf6df211270d (commit)
via 74edf1b485dc6bb854c62569c15804e374501474 (commit)
via 1e68fc47057e7e550ad8d2caaa494dff3606c308 (commit)
via e269aa4de7d45dd67de9586c68c4862b1fddcf8b (commit)
via 84f2eb679e63262aa666f827a9e788bd4d9286a7 (commit)
via dc3a0a1db59167b7e35ada56255edfad4bb23717 (commit)
via 4fb24c6b8ac5626169b8c90edebbb352316b8d9a (commit)
via 7c75667960584cfd2c1a25f4bc62073fa0457f93 (commit)
via 21ec1f00ce49d7fcde2f79247987da0edae93fed (commit)
via cd3027b1a955faf68ef74dea54e2bf524998f6f2 (commit)
via 49561898ec44c0317550508ca442fee90680c793 (commit)
via d696135b1ea6c9e27fbe9d9d38aae1650d96b395 (commit)
via 4eb2b603a8b91f54a386a0279ae455f059c8e8e8 (commit)
from d0b0931b6a6fdc712f33d020223ced849f264595 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c6fb66f9566951124ccd66f1592f87c3ec60ca85
Merge: 1e2914a ba3c038
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 22:12:41 2010 +0100
Merge remote branch 'stevee/libcap-ng' into next
commit ba3c038fa9aba1fe310868ec934ea426409fa27c
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 19:42:27 2010 +0100
libcap-ng: Update to 0.6.5.
This fixes #84.
commit 1e2914a72a796552ef9320fcd6d23ca0315fbc65
Merge: f8cd422 74edf1b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 18:44:23 2010 +0100
Merge remote branch 'stevee/util-linux-ng' into next
commit f8cd422890c02cb2a6847b0cf905030b2f414eb3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 6 15:10:28 2010 +0100
python-qtermwidget: Add patch to remove SEGV in the module.
Fixes #80. It has been a hard one.
commit e882664cd36ac19040a8201b16debf6df211270d
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sat Nov 6 15:00:28 2010 +0100
xorg-x11-xkb-utils: Provide more binaries.
This fixes #86.
commit 74edf1b485dc6bb854c62569c15804e374501474
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Fri Nov 5 17:19:26 2010 +0100
xfsprogs: Update dependencies.
commit 1e68fc47057e7e550ad8d2caaa494dff3606c308
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Fri Nov 5 17:15:08 2010 +0100
xen: Update dependencies.
commit e269aa4de7d45dd67de9586c68c4862b1fddcf8b
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Fri Nov 5 17:10:32 2010 +0100
udev: Update dependencies.
commit 84f2eb679e63262aa666f827a9e788bd4d9286a7
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Fri Nov 5 17:08:52 2010 +0100
reiser4progs: Update dependencies.
commit dc3a0a1db59167b7e35ada56255edfad4bb23717
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Fri Nov 5 17:05:03 2010 +0100
qemu: Update dependencies.
commit 4fb24c6b8ac5626169b8c90edebbb352316b8d9a
Merge: 7c75667 236898d
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 16:50:55 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into util-linux-ng
commit 7c75667960584cfd2c1a25f4bc62073fa0457f93
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 16:47:50 2010 +0100
parted: Update dependencies.
commit 21ec1f00ce49d7fcde2f79247987da0edae93fed
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 15:49:53 2010 +0100
os-prober: Update dependencies.
commit cd3027b1a955faf68ef74dea54e2bf524998f6f2
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 15:43:32 2010 +0100
gupnp: Update dependencies.
commit 49561898ec44c0317550508ca442fee90680c793
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 15:40:56 2010 +0100
e2fsprogs: Update dependencies.
commit d696135b1ea6c9e27fbe9d9d38aae1650d96b395
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 15:36:28 2010 +0100
btrfs-progs: Update dependecies.
commit 4eb2b603a8b91f54a386a0279ae455f059c8e8e8
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Thu Nov 4 15:34:40 2010 +0100
util-linux-ng: Split libraries into own packages.
Splited into seperate packages for:
* libuuid & libuuid-devel
* libblkid & libblkid-devel
* libmount & libmount-devel
-----------------------------------------------------------------------
Summary of changes:
pkgs/core/btrfs-progs/btrfs-progs.nm | 2 +-
pkgs/core/e2fsprogs/e2fsprogs.nm | 2 +-
pkgs/core/gupnp/gupnp.nm | 4 +-
pkgs/core/libcap-ng/libcap-ng.nm | 2 +-
.../libcap-ng/patches/libcap-ng-0.6.5-device.patch | 41 -------------
pkgs/core/os-prober/os-prober.nm | 2 +-
pkgs/core/parted/parted.nm | 2 +-
.../python-qtermwidget/patches/addStartShell.patch | 12 ++++
pkgs/core/python-qtermwidget/python-qtermwidget.nm | 2 +-
pkgs/core/qemu/qemu.nm | 4 +-
pkgs/core/reiser4progs/reiser4progs.nm | 2 +-
pkgs/core/udev/udev.nm | 4 +-
pkgs/core/util-linux-ng/util-linux-ng.nm | 64 +++++++++++++++++++-
pkgs/core/xen/xen.nm | 4 +-
pkgs/core/xfsprogs/xfsprogs.nm | 4 +-
pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 17 ++++-
16 files changed, 105 insertions(+), 63 deletions(-)
delete mode 100644 pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch
create mode 100644 pkgs/core/python-qtermwidget/patches/addStartShell.patch
Difference in files:
diff --git a/pkgs/core/btrfs-progs/btrfs-progs.nm b/pkgs/core/btrfs-progs/btrfs-progs.nm
index a1e7ca6..ac733c8 100644
--- a/pkgs/core/btrfs-progs/btrfs-progs.nm
+++ b/pkgs/core/btrfs-progs/btrfs-progs.nm
@@ -34,7 +34,7 @@ PKG_URL = http://btrfs.wiki.kernel.org/index.php/Main_Page
PKG_LICENSE = GPLv2
PKG_SUMMARY = Userspace programs for btrfs.
-PKG_BUILD_DEPS+= util-linux-ng-devel
+PKG_BUILD_DEPS+= libuuid-devel
define PKG_DESCRIPTION
The btrfs-progs package provides all the userpsace programs needed to create, \
diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm
index 12accd3..498a4f6 100644
--- a/pkgs/core/e2fsprogs/e2fsprogs.nm
+++ b/pkgs/core/e2fsprogs/e2fsprogs.nm
@@ -42,7 +42,7 @@ define PKG_DESCRIPTION
and third extended (ext2/ext3) filesystems.
endef
-PKG_BUILD_DEPS+= pkg-config util-linux-ng-devel
+PKG_BUILD_DEPS+= libblkid-devel libuuid-devel pkg-config
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/gupnp/gupnp.nm b/pkgs/core/gupnp/gupnp.nm
index 126ba86..ae12a23 100644
--- a/pkgs/core/gupnp/gupnp.nm
+++ b/pkgs/core/gupnp/gupnp.nm
@@ -34,8 +34,8 @@ PKG_URL = http://www.gupnp.org
PKG_LICENSE = LGPL
PKG_SUMMARY = An UPNP framework.
-PKG_BUILD_DEPS+= glib2-devel gssdp-devel libsoup-devel libxml2-devel \
- pkg-config util-linux-ng-devel
+PKG_BUILD_DEPS+= glib2-devel gssdp-devel libsoup-devel libuuid-devel \
+ libxml2-devel pkg-config
define PKG_DESCRIPTION
GUPnP is an object-oriented open source framework for creating UPnP\
diff --git a/pkgs/core/libcap-ng/libcap-ng.nm b/pkgs/core/libcap-ng/libcap-ng.nm
index daca254..189f2a0 100644
--- a/pkgs/core/libcap-ng/libcap-ng.nm
+++ b/pkgs/core/libcap-ng/libcap-ng.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = libcap-ng
-PKG_VER = 0.6.4
+PKG_VER = 0.6.5
PKG_REL = 0
PKG_MAINTAINER =
diff --git a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch b/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch
deleted file mode 100644
index 7effd72..0000000
--- a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urp libcap-ng-0.6.5.orig/utils/filecap.c libcap-ng-0.6.5/utils/filecap.c
---- libcap-ng-0.6.5.orig/utils/filecap.c 2010-06-17 13:19:21.000000000 -0400
-+++ libcap-ng-0.6.5/utils/filecap.c 2010-06-17 14:25:07.000000000 -0400
-@@ -41,12 +41,15 @@ static void usage(void)
- exit(1);
- }
-
--static int check_file(const char *file,
-- const struct stat *sb_unused __attribute__ ((unused)),
-- int flag_unused __attribute__ ((unused)),
-+static int check_file(const char *fpath,
-+ const struct stat *sb,
-+ int typeflag_unused __attribute__ ((unused)),
- struct FTW *s_unused __attribute__ ((unused)))
- {
-- int fd = open(file, O_RDONLY);
-+ if (S_ISREG(sb->st_mode) == 0)
-+ return FTW_CONTINUE;
-+
-+ int fd = open(fpath, O_RDONLY);
- if (fd >= 0) {
- capng_results_t rc;
-
-@@ -58,7 +61,7 @@ static int check_file(const char *file,
- header = 1;
- printf("%-20s capabilities\n", "file");
- }
-- printf("%s ", file);
-+ printf("%s ", fpath);
- if (rc == CAPNG_FULL)
- printf("full");
- else
-@@ -68,7 +71,7 @@ static int check_file(const char *file,
- }
- close(fd);
- }
-- return 0;
-+ return FTW_CONTINUE;
- }
-
-
diff --git a/pkgs/core/os-prober/os-prober.nm b/pkgs/core/os-prober/os-prober.nm
index d2eb74d..b37f80f 100644
--- a/pkgs/core/os-prober/os-prober.nm
+++ b/pkgs/core/os-prober/os-prober.nm
@@ -35,7 +35,7 @@ PKG_LICENSE = GPL
PKG_SUMMARY = Utility to detect other OSes on a set of drives.
PKG_BUILD_DEPS+= dmraid-devel libdevmapper-devel libudev-devel \
- util-linux-ng-devel
+ libuuid-devel
define PKG_DESCRIPTION
os-prober is a spinoff of debian-installer. One of the installer's features \
diff --git a/pkgs/core/parted/parted.nm b/pkgs/core/parted/parted.nm
index 82083ed..73a93e9 100644
--- a/pkgs/core/parted/parted.nm
+++ b/pkgs/core/parted/parted.nm
@@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/parted
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The GNU disk partition manipulation program.
-PKG_BUILD_DEPS+= libdevmapper-devel readline-devel util-linux-ng-devel
+PKG_BUILD_DEPS+= libdevmapper-devel libuuid-devel readline-devel
define PKG_DESCRIPTION
The GNU Parted program allows you to create, destroy, resize, move, \
diff --git a/pkgs/core/python-qtermwidget/patches/addStartShell.patch b/pkgs/core/python-qtermwidget/patches/addStartShell.patch
new file mode 100644
index 0000000..7ff30c4
--- /dev/null
+++ b/pkgs/core/python-qtermwidget/patches/addStartShell.patch
@@ -0,0 +1,12 @@
+Index: qtermwidget/qtermwidget.sip
+===================================================================
+--- qtermwidget.orig/qtermwidget.sip
++++ qtermwidget/qtermwidget.sip
+@@ -19,6 +19,7 @@ public:
+ ScrollBarLeft=1,
+ ScrollBarRight=2
+ };
++ void startShellProgram();
+ void setTerminalFont(QFont &font);
+ void setShellProgram(QString &progname);
+ void setArgs(QStringList &args);
diff --git a/pkgs/core/python-qtermwidget/python-qtermwidget.nm b/pkgs/core/python-qtermwidget/python-qtermwidget.nm
index 2e80268..70713fe 100644
--- a/pkgs/core/python-qtermwidget/python-qtermwidget.nm
+++ b/pkgs/core/python-qtermwidget/python-qtermwidget.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = python-qtermwidget
PKG_VER = 0.1.2
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = Development/Languages
diff --git a/pkgs/core/qemu/qemu.nm b/pkgs/core/qemu/qemu.nm
index eb8fc69..c960b6c 100644
--- a/pkgs/core/qemu/qemu.nm
+++ b/pkgs/core/qemu/qemu.nm
@@ -34,8 +34,8 @@ PKG_URL = http://www.linux-kvm.org/page/Main_Page
PKG_LICENSE = GPLv2+
PKG_SUMMARY = QEMU is a generic and open source machine emulator and virtualizer.
-PKG_BUILD_DEPS+= libcurl-devel gnutls-devel ncurses-devel pciutils-devel \
- sdl-devel util-linux-ng-devel
+PKG_BUILD_DEPS+= libcurl-devel libuuid-devel gnutls-devel ncurses-devel \
+ pciutils-devel sdl-devel
define PKG_DESCRIPTION
QEMU is a processor emulator that relies on dynamic binary translation \
diff --git a/pkgs/core/reiser4progs/reiser4progs.nm b/pkgs/core/reiser4progs/reiser4progs.nm
index 03eaf77..bd51363 100644
--- a/pkgs/core/reiser4progs/reiser4progs.nm
+++ b/pkgs/core/reiser4progs/reiser4progs.nm
@@ -35,7 +35,7 @@ PKG_LICENSE = GPL
PKG_SUMMARY = Administration utilities for the Reiser4 filesystem.
PKG_BUILD_DEPS+= autoconf automake e2fsprogs-devel libaal-devel libtool \
- ncurses-devel readline-devel util-linux-ng-devel
+ libuuid-devel ncurses-devel readline-devel
define PKG_DESCRIPTION
The filesystem utilities for the reiser4 filesystem, including: \
diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm
index 045c7bb..0f42999 100644
--- a/pkgs/core/udev/udev.nm
+++ b/pkgs/core/udev/udev.nm
@@ -34,8 +34,8 @@ PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A userspace implementation of devfs.
-PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libusb-compat-devel \
- pciutils pkg-config usbutils util-linux-ng-devel
+PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libuuid-devel \
+ libusb-compat-devel pciutils pkg-config usbutils
define PKG_DESCRIPTION
The udev package contains an implementation of devfs in userspace using \
diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm
index 85a6486..457b3e2 100644
--- a/pkgs/core/util-linux-ng/util-linux-ng.nm
+++ b/pkgs/core/util-linux-ng/util-linux-ng.nm
@@ -45,7 +45,69 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-PKG_PACKAGES += $(PKG_NAME)-devel
+PKG_PACKAGES += libblkid libblkid-devel libuuid libuuid-devel \
+ libmount libmount-devel
+
+# Package information for libblkid
+PKG_SUMMARY-libblkid = Block device ID library.
+PKG_DESCRIPTION-libblkid = This is the block device identification library, \
+ part of util-linux-ng.
+
+define PKG_FILES-libblkid
+ /lib/libblkid.*
+endef
+
+# Package information for libblkid-devel
+PKG_SUMMARY-libblkid-devel = Development library and header of libblkid.
+PKG_DESCRIPTION-libblkid-devel = $(PKG_SUMMARY-libblkid-devel)
+
+define PKG_FILES-libblkid-devel
+ /usr/include/blkid/ \
+ /usr/lib/libblkid.* \
+ /usr/lib/pkgconfig/blkid.pc \
+ /usr/share/man/man3/*blkid*
+endef
+
+# Package information for libuuid
+PKG_SUMMARY-libuuid = Universally unique ID library.
+PKG_DESCRIPTION-libuuid = This is the universally unique ID library, \
+ part of util-linux-ng.
+
+define PKG_FILES-libuuid
+ /lib/libuuid.*
+endef
+
+# Package information for libuuid-devel
+PKG_SUMMARY-libuuid-devel = Development library and header of libuuid.
+PKG_DESCRIPTION-libuuid-devel = $(PKG_SUMMARY-libuuid-devel)
+
+define PKG_FILES-libuuid-devel
+ /usr/include/uuid/ \
+ /usr/lib/libuuid.* \
+ /usr/lib/pkgconfig/uuid.pc \
+ /usr/share/man/man3/*uuid*
+endef
+
+# Package information for libmount
+PKG_SUMMARY-libmount = Device mounting library.
+PKG_DESCRIPTION-libmount = This is the device mounting library, \
+ part of util-linux-ng.
+
+define PKG_FILES-libmount
+ /lib/libmount.*
+endef
+
+# Package information for libmount-devel
+PKG_SUMMARY-libmount-devel = Development library and header of libmount.
+PKG_DESCRIPTION-libmount-devel = $(PKG_SUMMARY-libmount-devel)
+
+define PKG_FILES-libmount-devel
+ /usr/include/mount/ \
+ /usr/lib/libmount.* \
+ /usr/lib/pkgconfig/mount.pc \
+ /usr/share/man/man3/*mount*
+endef
+
CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm
index f5bff8d..2848452 100644
--- a/pkgs/core/xen/xen.nm
+++ b/pkgs/core/xen/xen.nm
@@ -40,8 +40,8 @@ define PKG_DESCRIPTION
feature set for virtualization.
endef
-PKG_BUILD_DEPS+= gettext-devel openssl-devel python python-devel sdl-devel \
- util-linux-ng-devel xorg-x11-proto-devel zlib-devel
+PKG_BUILD_DEPS+= gettext-devel libuuid-devel openssl-devel python python-devel \
+ sdl-devel xorg-x11-proto-devel zlib-devel
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/xfsprogs/xfsprogs.nm b/pkgs/core/xfsprogs/xfsprogs.nm
index 0650784..5e6b08d 100644
--- a/pkgs/core/xfsprogs/xfsprogs.nm
+++ b/pkgs/core/xfsprogs/xfsprogs.nm
@@ -34,8 +34,8 @@ PKG_URL = http://oss.sgi.com/projects/xfs/
PKG_LICENSE = GPL+ and LGPLv2+
PKG_SUMMARY = Utilities for managing the XFS filesystem
-PKG_BUILD_DEPS+= libacl-devel e2fsprogs-devel libtool gettext readline-devel \
- util-linux-ng-devel
+PKG_BUILD_DEPS+= e2fsprogs-devel gettext libacl-devel libblkid-devel libtool \
+ libuuid-devel readline-devel
define PKG_DESCRIPTION
A set of commands to use the XFS filesystem, including mkfs.xfs.
diff --git a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
index 795c5f0..80cc914 100644
--- a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
+++ b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = xorg-x11-xkb-utils
PKG_VER = 7.4
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
PKG_GROUP = X/Fonts
@@ -34,7 +34,8 @@ PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 xkb utilities.
-PKG_BUILD_DEPS+= bison libX11-devel libxkbfile-devel pkg-config
+PKG_BUILD_DEPS+= bison libX11-devel libXaw-devel libXt-devel libxkbfile-devel \
+ pkg-config
define PKG_DESCRIPTION
X.Org X11 xkb utilities.
@@ -43,7 +44,11 @@ endef
CFLAGS += -DHAVE_STRCASECMP
SRC_PACKAGES = \
- xkbcomp-1.1.1
+ xkbcomp-1.1.1 \
+ xkbutils-1.0.3 \
+ xkbevd-1.1.1 \
+ xkbprint-1.0.1 \
+ setxkbmap-1.2.0
PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2)
@@ -70,6 +75,10 @@ define MACRO_INSTALL
endef
-STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package)))
+define STAGE_INSTALL
+ $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package)))
+
+ mv $(BUILDROOT)/usr/man* $(BUILDROOT)/usr/share/man
+endef
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d0b0931b6a6fdc712f33d020223ced849f264595
by gitï¼ ipfire.org 05 Nov '10
by gitï¼ ipfire.org 05 Nov '10
05 Nov '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via d0b0931b6a6fdc712f33d020223ced849f264595 (commit)
via f360facb610d1cc5a43948d26c76c35d0aaa13e6 (commit)
via fc9286643ee2637687e9744a90ea54a523a6c99f (commit)
via 4acac6c20b40251526f9a9265b08707bd65d8802 (commit)
via a1f9cb0a03b56ac53e70708b9c0e36118dc2fd65 (commit)
via 378d39c4698f795d84c85543b666e1bd07493d16 (commit)
via 6312b7d05908c1ad67d760baacf8520b6a659afd (commit)
via 76c8c32a810a38f896cd80010ed4616b3226abfa (commit)
via 0352604e9d1015cfd4662f948197f8f0e8590cde (commit)
via 3c4e6e3cee9684ee74f836ee44d88d275f2bbc24 (commit)
via ba2e7991cc67689b4cde7f41bf5236064b082362 (commit)
via fc8c7db0171ae0a6b4f649b7066f987ec429a98f (commit)
from 236898d61338706c7a8f22f80eb7a2d917619805 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d0b0931b6a6fdc712f33d020223ced849f264595
Merge: f360fac 236898d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 5 18:32:25 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit f360facb610d1cc5a43948d26c76c35d0aaa13e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 5 18:31:52 2010 +0100
sip: Update to current snapshot version (4.12-snapshot).
commit fc9286643ee2637687e9744a90ea54a523a6c99f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 5 18:31:39 2010 +0100
pyQt: Add --assume-shared.
commit 4acac6c20b40251526f9a9265b08707bd65d8802
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Nov 5 11:28:42 2010 +0100
qt: Don't delete any files.
This breaks more than you would have expected.
commit a1f9cb0a03b56ac53e70708b9c0e36118dc2fd65
Merge: 6312b7d 378d39c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 31 22:50:41 2010 +0100
Merge remote branch 'stevee/qt' into next
commit 378d39c4698f795d84c85543b666e1bd07493d16
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sun Oct 31 22:46:16 2010 +0100
qt: Add patches to fix a lot of bugs.
commit 6312b7d05908c1ad67d760baacf8520b6a659afd
Merge: 76c8c32 3c4e6e3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 31 17:03:33 2010 +0100
Merge remote branch 'stevee/openssh' into next
commit 76c8c32a810a38f896cd80010ed4616b3226abfa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 31 17:03:11 2010 +0100
pyQt: Update to 4.8.1.
commit 0352604e9d1015cfd4662f948197f8f0e8590cde
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 31 17:02:06 2010 +0100
gcc: Apply some bugfix patches to gcc.
commit 3c4e6e3cee9684ee74f836ee44d88d275f2bbc24
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sun Oct 31 16:50:35 2010 +0100
openssh: Fix typo in NM.
commit ba2e7991cc67689b4cde7f41bf5236064b082362
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Sun Oct 31 16:39:47 2010 +0100
openssh: Split package into openssh-clients and openssh-server.
commit fc8c7db0171ae0a6b4f649b7066f987ec429a98f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 31 12:40:17 2010 +0100
Revert "gcc: Update patchset and fix errors."
This reverts commit e3a40b9851a8dcea07af83289ecfdc46d89cba2a.
-----------------------------------------------------------------------
Summary of changes:
pkgs/core/gcc/gcc.nm | 2 +-
...0.patch => gcc-4.5.0-piepatches-20100421.patch} | 438 ++++++++++++++------
pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch | 27 ++
pkgs/core/openssh/openssh.nm | 27 ++
pkgs/core/pyQt/pyQt.nm | 5 +-
...makes-override-redirect-windows-popup-men.patch | 67 +++
...adds-support-for-using-isystem-to-allow-p.patch | 56 +++
...tabs-are-inserted-or-removed-in-a-QTabBar.patch | 47 +++
...0012-Add-context-to-tr-calls-in-QShortcut.patch | 70 ++++
pkgs/core/qt/patches/qt | 1 +
.../patches/qt-4.6.3-bn-rendering-bz562049.patch | 15 +
.../patches/qt-4.6.3-bn-rendering-bz562058.patch | 12 +
.../qt-4.6.3-indic-rendering-bz631732.patch | 14 +
.../qt-4.6.3-indic-rendering-bz636399.patch | 30 ++
.../qt-everywhere-opensource-src-4.6.2-cups.patch | 84 ++++
...source-src-4.6.3-glib_eventloop_nullcheck.patch | 21 +
...e-src-4.7.0-CVE-2010-1822-crash-svg-image.patch | 26 ++
...pensource-src-4.7.0-QTBUG-13567-QTreeView.patch | 31 ++
...verywhere-opensource-src-4.7.0-QTBUG-6185.patch | 34 ++
...ource-src-4.7.0-beta1-qtwebkit_pluginpath.patch | 19 +
...erywhere-opensource-src-4.7.0-beta1-s390x.patch | 61 +++
...e-opensource-src-4.7.0-beta1-uic_multilib.patch | 36 ++
...e-opensource-src-4.7.0-beta2-kde4_plugins.patch | 19 +
...e-opensource-src-4.7.0-beta2-mysql_config.patch | 19 +
...ource-src-4.7.0-beta2-phonon_servicesfile.patch | 40 ++
.../qt-everywhere-opensource-src-4.7.0-bpp24.patch | 15 +
...11-opensource-src-4.2.2-multilib-optflags.patch | 33 ++
...ensource-src-4.5.0-fix-qatomic-inline-asm.patch | 50 +++
...-opensource-src-4.5.1-enable_ft_lcdfilter.patch | 12 +
pkgs/core/qt/qt.nm | 9 +-
pkgs/core/sip/sip.nm | 4 +-
31 files changed, 1182 insertions(+), 142 deletions(-)
rename pkgs/core/gcc/patches/{gcc-4.5.1-esp-20101030.patch => gcc-4.5.0-piepatches-20100421.patch} (67%)
create mode 100644 pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch
create mode 100644 pkgs/core/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
create mode 100644 pkgs/core/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
create mode 100644 pkgs/core/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
create mode 100644 pkgs/core/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
create mode 160000 pkgs/core/qt/patches/qt
create mode 100644 pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
create mode 100644 pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
create mode 100644 pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
create mode 100644 pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
create mode 100644 pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
create mode 100644 pkgs/core/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
create mode 100644 pkgs/core/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
create mode 100644 pkgs/core/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
Difference in files:
diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index b1cc18a..e16e683 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = gcc
PKG_VER = 4.5.1
-PKG_REL = 2
+PKG_REL = 3
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUP = Development/Compilers
diff --git a/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch b/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
new file mode 100644
index 0000000..e525d5b
--- /dev/null
+++ b/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
@@ -0,0 +1,1056 @@
+diff -Nur gcc-4.5.0-vanilla/configure gcc-4.5.0/configure
+--- gcc-4.5.0-vanilla/configure 2010-04-02 19:35:47.000000000 +0200
++++ gcc-4.5.0/configure 2010-04-21 15:21:09.762948361 +0200
+@@ -707,6 +707,7 @@
+ CFLAGS
+ CC
+ target_subdir
++enable_esp
+ host_subdir
+ build_subdir
+ build_libsubdir
+@@ -1485,6 +1486,11 @@
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-gold use gold instead of ld
+ --enable-libada build libada directory
++ --enable-esp
++ Enable Stack protector, Position independent executable and
++ Fortify_sources as default if we have suppot for it when compiling
++ and link with -z relro and -z now as default.
++ Linux targets supported i*86, x86_64, powerpc*, ia64, arm* and mips
+ --enable-libssp build libssp directory
+ --enable-build-with-cxx build with C++ compiler instead of C compiler
+ --disable-ppl-version-check disable check for PPL version
+@@ -3164,6 +3170,24 @@
+ noconfigdirs="$noconfigdirs gnattools"
+ fi
+
++# Check whether --enable-esp was given and target have the support.
++# Check whether --enable-esp or --disable-esp was given.
++if test "${enable_esp+set}" = set; then
++ enableval="$enable_esp"
++
++ case $target in
++ i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux* | mips-*-linux*)
++ enable_esp=yes
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported on this $target target." >&5
++echo "$as_me: error: *** --enable-esp is not supported on this $target target." >&2;}
++ { (exit 1); exit 1; }; }
++ ;;
++ esac
++
++fi;
++
+ # Check whether --enable-libssp was given.
+ if test "${enable_libssp+set}" = set; then :
+ enableval=$enable_libssp; ENABLE_LIBSSP=$enableval
+@@ -14290,6 +14314,9 @@
+ *) stage1_cflags="-g -J" ;;
+ esac ;;
+ esac
++if test x$enable_esp = xyes; then
++ stage1_cflags="$stage1_cflags -fno-stack-protector"
++fi
+
+ # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
+ if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
+diff -Nur gcc-4.5.0-vanilla/gcc/config/i386/linux64.h gcc-4.5.0/gcc/config/i386/linux64.h
+--- gcc-4.5.0-vanilla/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100
++++ gcc-4.5.0/gcc/config/i386/linux64.h 2010-04-21 15:21:16.730815972 +0200
+@@ -115,7 +115,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h. */
+ #define REG_NAME(reg) reg
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14,
+ x86_64 glibc provides it in %fs:0x28. */
+ #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? 0x28 : 0x14)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/i386/linux.h gcc-4.5.0/gcc/config/i386/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/i386/linux.h 2010-03-24 21:44:48.000000000 +0100
++++ gcc-4.5.0/gcc/config/i386/linux.h 2010-04-21 15:21:16.721813554 +0200
+@@ -212,7 +212,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h. */
+ #define REG_NAME(reg) reg
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14. */
+ #define TARGET_THREAD_SSP_OFFSET 0x14
+ #endif
+diff -Nur gcc-4.5.0-vanilla/gcc/config/linux.h gcc-4.5.0/gcc/config/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/linux.h 2009-04-09 17:00:19.000000000 +0200
++++ gcc-4.5.0/gcc/config/linux.h 2010-04-21 15:21:16.667815357 +0200
+@@ -43,7 +43,11 @@
+ object constructed before entering `main'. */
+
+ #undef STARTFILE_SPEC
+-#if defined HAVE_LD_PIE
++#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
++#define STARTFILE_SPEC \
++ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s \
++ %{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
++#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
+ #define STARTFILE_SPEC \
+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
+ crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
+diff -Nur gcc-4.5.0-vanilla/gcc/config/rs6000/linux64.h gcc-4.5.0/gcc/config/rs6000/linux64.h
+--- gcc-4.5.0-vanilla/gcc/config/rs6000/linux64.h 2010-03-17 05:44:37.000000000 +0100
++++ gcc-4.5.0/gcc/config/rs6000/linux64.h 2010-04-21 15:21:16.732816308 +0200
+@@ -162,7 +162,7 @@
+ #endif
+
+ #define ASM_SPEC32 "-a32 %{n} %{T} %{Ym,*} %{Yd,*} \
+-%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
++%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} \
+ %{memb} %{!memb: %{msdata=eabi: -memb}} \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+ %{mcall-freebsd: -mbig} \
+@@ -525,7 +525,7 @@
+
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2),
+ ppc64 glibc provides it at -0x7010(13). */
+ #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? -0x7010 : -0x7008)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/rs6000/linux.h gcc-4.5.0/gcc/config/rs6000/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/rs6000/linux.h 2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.5.0/gcc/config/rs6000/linux.h 2010-04-21 15:21:16.731819651 +0200
+@@ -117,7 +117,7 @@
+
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2). */
+ #define TARGET_THREAD_SSP_OFFSET -0x7008
+ #endif
+diff -Nur gcc-4.5.0-vanilla/gcc/config/rs6000/sysv4.h gcc-4.5.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.5.0-vanilla/gcc/config/rs6000/sysv4.h 2009-11-25 21:23:20.000000000 +0100
++++ gcc-4.5.0/gcc/config/rs6000/sysv4.h 2010-04-21 15:21:16.674812959 +0200
+@@ -883,7 +883,12 @@
+ %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
+ %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
+
+-#ifdef HAVE_LD_PIE
++#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
++#define STARTFILE_LINUX_SPEC \
++ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
++ %{mnewlib:ecrti.o%s;:crti.o%s} \
++ {static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
++#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
+ #define STARTFILE_LINUX_SPEC "\
+ %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
+ %{mnewlib:ecrti.o%s;:crti.o%s} \
+diff -Nur gcc-4.5.0-vanilla/gcc/config/s390/linux.h gcc-4.5.0/gcc/config/s390/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/s390/linux.h 2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.5.0/gcc/config/s390/linux.h 2010-04-21 15:21:16.738814124 +0200
+@@ -93,7 +93,7 @@
+
+ #define MD_UNWIND_SUPPORT "config/s390/linux-unwind.h"
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* s390 glibc provides __stack_chk_guard in 0x14(tp),
+ s390x glibc provides it at 0x28(tp). */
+ #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? 0x28 : 0x14)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/sparc/linux64.h gcc-4.5.0/gcc/config/sparc/linux64.h
+--- gcc-4.5.0-vanilla/gcc/config/sparc/linux64.h 2009-12-08 00:31:01.000000000 +0100
++++ gcc-4.5.0/gcc/config/sparc/linux64.h 2010-04-21 15:21:16.749816158 +0200
+@@ -298,7 +298,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14],
+ sparc64 glibc provides it at [%g7 + 0x28]. */
+ #define TARGET_THREAD_SSP_OFFSET (TARGET_ARCH64 ? 0x28 : 0x14)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/sparc/linux.h gcc-4.5.0/gcc/config/sparc/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/sparc/linux.h 2009-12-08 00:31:01.000000000 +0100
++++ gcc-4.5.0/gcc/config/sparc/linux.h 2010-04-21 15:21:16.746815839 +0200
+@@ -172,7 +172,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14]. */
+ #define TARGET_THREAD_SSP_OFFSET 0x14
+ #endif
+diff -Nur gcc-4.5.0-vanilla/gcc/config.in gcc-4.5.0/gcc/config.in
+--- gcc-4.5.0-vanilla/gcc/config.in 2010-04-14 11:30:07.000000000 +0200
++++ gcc-4.5.0/gcc/config.in 2010-04-21 15:21:09.879812904 +0200
+@@ -52,6 +52,12 @@
+ #endif
+
+
++/* Define to 1 to enable crtbeginTS.o. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_CRTBEGINTS
++#endif
++
++
+ /* Define to 1 to specify that we are using the BID decimal floating point
+ format instead of DPD */
+ #ifndef USED_FOR_TARGET
+@@ -71,6 +77,12 @@
+ #endif
+
+
++/* Define to 1 to enable esp. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_ESP
++#endif
++
++
+ /* Define to 1 to enable fixed-point arithmetic extension to C. */
+ #ifndef USED_FOR_TARGET
+ #undef ENABLE_FIXED_POINT
+@@ -996,6 +1008,12 @@
+ #endif
+
+
++/* Define to 1 if your compiler supports -fstack-protector */
++#ifndef USED_FOR_TARGET
++#undef HAVE_GCC_SSP
++#endif
++
++
+ /* Define to 1 if you have the `getchar_unlocked' function. */
+ #ifndef USED_FOR_TARGET
+ #undef HAVE_GETCHAR_UNLOCKED
+diff -Nur gcc-4.5.0-vanilla/gcc/configure gcc-4.5.0/gcc/configure
+--- gcc-4.5.0-vanilla/gcc/configure 2010-03-26 06:40:32.000000000 +0100
++++ gcc-4.5.0/gcc/configure 2010-04-21 15:21:09.784072083 +0200
+@@ -678,6 +678,8 @@
+ HOST_LIBS
+ GGC
+ libgcc_visibility
++enable_esp
++enable_crtbeginTS
+ gcc_cv_readelf
+ gcc_cv_objdump
+ ORIGINAL_NM_FOR_TARGET
+@@ -24576,6 +24578,50 @@
+ ;;
+ esac
+
++echo "$as_me:$LINENO: checking linker -z now support" >&5
++echo $ECHO_N "checking linker -z now support... $ECHO_C" >&6
++if test "${gcc_cv_ld_now+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ gcc_cv_ld_now=no
++if test $in_tree_ld = yes ; then
++ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
++ && test $in_tree_ld_is_elf = yes; then
++ gcc_cv_ld_now=yes
++ fi
++elif test x$gcc_cv_ld != x; then
++ # Check if linker supports -z now options
++ if $gcc_cv_ld --help 2>/dev/null | grep now > /dev/null; then
++ gcc_cv_ld_now=yes
++ fi
++fi
++
++fi
++echo "$as_me:$LINENO: result: $gcc_cv_ld_now" >&5
++echo "${ECHO_T}$gcc_cv_ld_now" >&6
++
++echo "$as_me:$LINENO: checking linker -z relro support" >&5
++echo $ECHO_N "checking linker -z relro support... $ECHO_C" >&6
++if test "${gcc_cv_ld_relro+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ gcc_cv_ld_relro=no
++if test $in_tree_ld = yes ; then
++ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
++ && test $in_tree_ld_is_elf = yes; then
++ gcc_cv_ld_relro=yes
++ fi
++elif test x$gcc_cv_ld != x; then
++ # Check if linker supports -z relro and -z norelro options
++ if $gcc_cv_ld --help 2>/dev/null | grep relro > /dev/null; then
++ gcc_cv_ld_relro=yes
++ fi
++fi
++
++fi
++echo "$as_me:$LINENO: result: $gcc_cv_ld_relro" >&5
++echo "${ECHO_T}$gcc_cv_ld_relro" >&6
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --build-id support" >&5
+ $as_echo_n "checking linker --build-id support... " >&6; }
+ if test "${gcc_cv_ld_buildid+set}" = set; then :
+@@ -24729,6 +24775,146 @@
+
+ fi
+
++if test x$gcc_cv_libc_provides_ssp = xyes; then
++ echo "$as_me:$LINENO: checking whether $CC support -fstack-protector" >&5
++echo $ECHO_N "checking whether $CC support -fstack-protector... $ECHO_C" >&6
++if test "${gcc_cv_cc_stack_protector+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ saved_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -fstack-protector"
++ cat >conftest.$ac_ext <<_ACEOF
++#ifndef __SSP__
++#error
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++
++ case $target in
++ i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux*)
++ if test x$set_have_as_tls = xyes; then
++ gcc_cv_cc_stack_protector=yes
++ else
++ gcc_cv_cc_stack_protector=no
++ fi
++ ;;
++ *)
++ cc_cv_cc_stack_protector=yes
++ ;;
++ esac
++
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++gcc_cv_cc_stack_protector=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ CFLAGS="$saved_CFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $gcc_cv_cc_stack_protector" >&5
++echo "${ECHO_T}$gcc_cv_cc_stack_protector" >&6
++fi
++if test x$gcc_cv_cc_stack_protector = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GCC_SSP 1
++_ACEOF
++
++fi
++
++
++if test x$enable_esp = xyes ; then
++case $target in
++ ia64*-*-linux*)
++ if test x$gcc_cv_ld_now = xyes; then
++ enable_esp_ld=yes
++ else
++ enable_esp_ld=no
++ fi
++ ;;
++ *-*-linux*)
++ if test x$gcc_cv_ld_relro = xyes && test x$gcc_cv_ld_now = xyes; then
++ enable_esp_ld=yes
++ else
++ enable_esp_ld=no
++ fi
++ ;;
++ *)
++ enable_esp_ld=no
++ ;;
++ esac
++else
++ enable_esp_ld=no
++fi
++if test x$enable_esp_ld = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_ESP 1
++_ACEOF
++
++fi
++if test x$enable_esp = xyes && test x$enable_esp_ld = xno; then
++ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&5
++echo "$as_me: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++echo "$as_me:$LINENO: checking for crtbeginTS.o support" >&5
++echo $ECHO_N "checking for crtbeginTS.o support... $ECHO_C" >&6
++if test "${enable_crtbeginTS+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++if test x$enable_esp = xyes ; then
++ case "$target" in
++ ia64*-*-linux*)
++ enable_crtbeginTS=no ;;
++ *-*-linux*)
++ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then
++ enable_crtbeginTS=yes
++ fi
++ ;;
++ *) enable_crtbeginTS=no ;;
++ esac
++fi
++
++fi
++echo "$as_me:$LINENO: result: $enable_crtbeginTS" >&5
++echo "${ECHO_T}$enable_crtbeginTS" >&6
++
++if test x$enable_crtbeginTS = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_CRTBEGINTS 1
++_ACEOF
++
++fi
++
+ # Check if TFmode long double should be used by default or not.
+ # Some glibc targets used DFmode long double, but with glibc 2.4
+ # and later they can use TFmode.
+diff -Nur gcc-4.5.0-vanilla/gcc/cp/lang-specs.h gcc-4.5.0/gcc/cp/lang-specs.h
+--- gcc-4.5.0-vanilla/gcc/cp/lang-specs.h 2007-08-06 13:10:19.000000000 +0200
++++ gcc-4.5.0/gcc/cp/lang-specs.h 2010-04-21 15:21:16.684816335 +0200
+@@ -47,7 +47,7 @@
+ %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+ cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2 %{+e1*}\
++ %(cc1_options) %(esp_options) %2 %{+e1*}\
+ %{!fsyntax-only:-o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {"@c++",
+@@ -57,11 +57,11 @@
+ %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+ cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2 %{+e1*}\
++ %(cc1_options) %(esp_options) %2 %{+e1*}\
+ %{!fsyntax-only:%(invoke_as)}}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {".ii", "@c++-cpp-output", 0, 0, 0},
+ {"@c++-cpp-output",
+ "%{!M:%{!MM:%{!E:\
+- cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++ cc1plus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+diff -Nur gcc-4.5.0-vanilla/gcc/doc/invoke.texi gcc-4.5.0/gcc/doc/invoke.texi
+--- gcc-4.5.0-vanilla/gcc/doc/invoke.texi 2010-04-06 16:02:22.000000000 +0200
++++ gcc-4.5.0/gcc/doc/invoke.texi 2010-04-21 15:21:16.796812184 +0200
+@@ -7856,6 +7856,11 @@
+ @opindex fstack-protector-all
+ Like @option{-fstack-protector} except that all functions are protected.
+
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}
++or @option{-nostdlib} or @option{-nodefaultlibs} or
++@option{-fstack-protector} are found.
++
+ @item -fsection-anchors
+ @opindex fsection-anchors
+ Try to reduce the number of symbolic address calculations by using
+@@ -8705,6 +8710,12 @@
+ that were used to generate code (@option{-fpie}, @option{-fPIE},
+ or model suboptions) when you specify this option.
+
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
++or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
++@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p}
++are found.
++
+ @item -rdynamic
+ @opindex rdynamic
+ Pass the flag @option{-export-dynamic} to the ELF linker, on targets
+@@ -17251,6 +17262,11 @@
+ @code{__pie__} and @code{__PIE__}. The macros have the value 1
+ for @option{-fpie} and 2 for @option{-fPIE}.
+
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
++or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
++@option{-nostartfiles} or @option{-shared} are found.
++
+ @item -fno-jump-tables
+ @opindex fno-jump-tables
+ Do not use jump tables for switch statements even where it would be
+diff -Nur gcc-4.5.0-vanilla/gcc/esp.h gcc-4.5.0/gcc/esp.h
+--- gcc-4.5.0-vanilla/gcc/esp.h 1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.5.0/gcc/esp.h 2010-04-21 15:21:16.622811922 +0200
+@@ -0,0 +1,148 @@
++/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
++ * Version 20100409.1
++ * Magnus Granberg (Zorry) <zorry(a)gentoo.org> */
++#ifndef GCC_ESP_H
++#define GCC_ESP_H
++
++/* This file will add -fstack-protector, -fPIE, -pie -D_FORTIFY_SOURCES=2 -z,relro and -z,now
++ as default if the defines and the spec allow it.
++
++ On Gentoo
++ Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
++ to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
++ We use -fstack-protector-all instead of -fstack-protector
++ This will add some unsupported upstream commands options as -nopie.
++ -D__KERNEL__ is added so we don't have -fPIE and -fstack-protector-all when building kernels.
++ ESP_CC1_SPEC is added to CC1_SPEC.
++ -D_FORTIFY_SOURCES=2 is added with gentoo's patchset as default so no need to set it hear.
++ ESP_LINK_SPEC will not add -z,relro as it default on with binutils.
++ ESP_CC1_STRICT_SPEC is added so we don't use gcc/opts.c to disable it.
++ ESP_OPTIONS_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile, -static and -shared.
++ ENABLE_CRTBEGINTS add support for crtbeginTS.o, build -static with -fPIE or -fpie.
++*/
++#ifdef ENABLE_ESP
++
++ /* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass */
++ #define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict)"
++ #ifdef HAVE_GCC_SSP
++ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
++ #else
++ #define ESP_CC1_SSP_SPEC ""
++ #endif
++ #define ESP_CC1_PIE_SPEC "%{!nopie: }"
++ #define ESP_CC1_STRICT_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
++
++ /* ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
++ -z now will be added if we don't have -vanilla spec */
++ #define ESP_LINK_SPEC "%(esp_link_now)"
++ #define ESP_LINK_NOW_SPEC "%{!now:-z now}"
++
++ /* ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c */
++ #define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
++
++ /* ESP_CPP_OPTIONS_SPEC is added to the cpp_options spec in gcc/gcc.c
++ For precompiling headers. */
++ #define ESP_CPP_OPTIONS_SPEC "%(esp_options_ssp)"
++
++ /* This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
++ -fstack-protector-all and we have TARGET_LIBC_PROVIDES_SSP and HAVE_GCC_SSP defined. */
++ #ifdef HAVE_GCC_SSP
++ #define ESP_OPTIONS_SSP_SPEC \
++ "%{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector: \
++ %{!fstack-protector:%{!fstack-protector-all:-fstack-protector-all}}}}}}"
++ #else
++ #define ESP_OPTIONS_SSP_SPEC ""
++ #endif
++
++ /* If HAVE_LD_PIE not defined we will not add any -fPIE -pie */
++ #ifdef HAVE_LD_PIE
++
++ /* We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options. */
++ #define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
++
++ /* This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
++ -nostdlib -nostartfiles. */
++ /* With ENABLE_CRTBEGINTS we don't need to check for -static */
++ #ifdef ENABLE_CRTBEGINTS
++ #define ESP_OPTIONS_PIE_SPEC \
++ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
++ %{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
++ #else
++ #define ESP_OPTIONS_PIE_SPEC \
++ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
++ %{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
++ #endif
++
++ /* This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib
++ -nostartfiles */
++ /* With ENABLE_CRTBEGINTS we don't need to check for -static
++ and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
++ #ifdef ENABLE_CRTBEGINTS
++ #define ESP_LINK_PIE_SPEC \
++ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
++ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
++ #else
++ #define ESP_LINK_PIE_SPEC \
++ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
++ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
++ #endif
++
++ /* This will check if shared is set when -static -pie -fPIE -fpie -fno-PIC -fno-pic, -pie is set when -static -pg -p -profile.
++ If set it will make gcc print out "-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible" or
++ "-pie and pg|p|profile are incompatible" */
++ /* With ENABLE_CRTBEGINTS we don't need to check for -static */
++ #ifdef ENABLE_CRTBEGINTS
++ #define ESP_OPTIONS_PIE_CHECK_SPEC \
++ "%{shared:%{static|pie|fPIE|fpie|fno-PIC|fno-pic:%e-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible}} \
++ %{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible}}"
++ #else
++ #define ESP_OPTIONS_PIE_CHECK_SPEC \
++ "%{shared:%{static|pie|fPIE|fpie|fno-PIC|fno-pic:%e-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible}} \
++ %{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible}}"
++ #endif
++
++ /* We don't pass -pie to the linker when -static */
++ #ifdef ENABLE_CRTBEGINTS
++ #define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link) "
++ #else
++ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link) "
++ #endif
++
++ #else
++ #define ESP_OPTIONS_PIE_SPEC ""
++ #define ESP_OPTIONS_PIE_CHECK_SPEC ""
++ #define ESP_LINK_PIE_SPEC ""
++ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link) "
++ #endif
++
++ /* We add extra spec name's to the EXTRA_SPECS list */
++ #define ESP_EXTRA_SPECS \
++ { "esp_cc1", ESP_CC1_SPEC }, \
++ { "esp_cc1_pie", ESP_CC1_PIE_SPEC }, \
++ { "esp_cc1_ssp", ESP_CC1_SSP_SPEC }, \
++ { "esp_cc1_strict", ESP_CC1_STRICT_SPEC }, \
++ { "esp_link", ESP_LINK_SPEC }, \
++ { "esp_link_now", ESP_LINK_NOW_SPEC }, \
++ { "esp_link_pie", ESP_LINK_PIE_SPEC }, \
++ { "esp_command_options", ESP_COMMAND_OPTIONS_SPEC }, \
++ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }, \
++ { "esp_options", ESP_OPTIONS_SPEC }, \
++ { "esp_options_pie", ESP_OPTIONS_PIE_SPEC }, \
++ { "esp_options_pie_check", ESP_OPTIONS_PIE_CHECK_SPEC }, \
++ { "esp_options_ssp", ESP_OPTIONS_SSP_SPEC }
++
++ static const char *esp_command_options_spec = ESP_COMMAND_OPTIONS_SPEC;
++ static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
++
++#else /* If not ESP_ENABLE defined do this. */
++
++ #define ESP_OPTIONS_SPEC ""
++ #define ESP_CPP_OPTIONS_SPEC ""
++
++ /* We add extra spec name's to the EXTRA_SPECS list */
++ #define ESP_EXTRA_SPECS \
++ { "esp_options", ESP_OPTIONS_SPEC }, \
++ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }
++
++#endif
++#endif /* End GCC_ESP_H */
+diff -Nur gcc-4.5.0-vanilla/gcc/gcc.c gcc-4.5.0/gcc/gcc.c
+--- gcc-4.5.0-vanilla/gcc/gcc.c 2010-02-11 13:23:08.000000000 +0100
++++ gcc-4.5.0/gcc/gcc.c 2010-04-21 15:21:16.589812777 +0200
+@@ -84,6 +84,7 @@
+ #include "gcc.h"
+ #include "flags.h"
+ #include "opts.h"
++#include "esp.h" /* for --enable-esp support */
+
+ #ifdef HAVE_MMAP_FILE
+ # include <sys/mman.h>
+@@ -822,7 +823,9 @@
+
+ static const char *asm_debug;
+ static const char *cpp_spec = CPP_SPEC;
++#ifndef ENABLE_ESP
+ static const char *cc1_spec = CC1_SPEC;
++#endif
+ static const char *cc1plus_spec = CC1PLUS_SPEC;
+ static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
+ static const char *link_ssp_spec = LINK_SSP_SPEC;
+@@ -885,7 +888,7 @@
+ static const char *cpp_options =
+ "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
+ %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
+- %{undef} %{save-temps*:-fpch-preprocess}";
++ %{undef} %{save-temps*:-fpch-preprocess} %(esp_cpp_options)";
+
+ /* This contains cpp options which are not passed when the preprocessor
+ output will be used by another program. */
+@@ -893,6 +896,9 @@
+
+ /* NB: This is shared amongst all front-ends, except for Ada. */
+ static const char *cc1_options =
++#ifdef ENABLE_ESP
++"%(esp_options_pie_check)"
++#endif
+ "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+ %1 %{!Q:-quiet} %{!dumpbase:-dumpbase %B} %{d*} %{m*} %{a*}\
+ %{fcompare-debug-second:%:compare-debug-auxbase-opt(%b)} \
+@@ -1075,15 +1081,15 @@
+ %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
+ %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
+ cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
+- %(cc1_options)}\
++ %(cc1_options) %(esp_options)}\
+ %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
+- cc1 %(cpp_unique_options) %(cc1_options)}}}\
++ cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}}\
+ %{!fsyntax-only:%(invoke_as)}} \
+ %{combine:\
+ %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
+ %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i}}\
+ %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
+- cc1 %(cpp_unique_options) %(cc1_options)}}\
++ cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}\
+ %{!fsyntax-only:%(invoke_as)}}}}}}", 0, 1, 1},
+ {"-",
+ "%{!E:%e-E or -x required when input is from standard input}\
+@@ -1106,7 +1112,7 @@
+ %W{o*:--output-pch=%*}%V}}}}}}", 0, 0, 0},
+ {".i", "@cpp-output", 0, 1, 0},
+ {"@cpp-output",
+- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
++ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(esp_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
+ {".s", "@assembler", 0, 1, 0},
+ {"@assembler",
+ "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0},
+@@ -1699,18 +1705,23 @@
+ INIT_STATIC_SPEC ("sysroot_hdrs_suffix_spec", &sysroot_hdrs_suffix_spec),
+ };
+
+-#ifdef EXTRA_SPECS /* additional specs needed */
++/* EXTRA_SPECS needs to be defined */
++#ifndef EXTRA_SPECS
++#define EXTRA_SPECS
++#endif
++
++/* EXTRA_SPECS and ESP_EXTRA_SPECS add additional specs */
+ /* Structure to keep track of just the first two args of a spec_list.
+- That is all that the EXTRA_SPECS macro gives us. */
++ That is all that the EXTRA_SPECS and ESP_EXTRA_SPECS macro gives us. */
+ struct spec_list_1
+ {
+ const char *const name;
+ const char *const ptr;
+ };
+
+-static const struct spec_list_1 extra_specs_1[] = { EXTRA_SPECS };
++/* ESP_EXTRA_SPECS before EXTRA_SPECS */
++static const struct spec_list_1 extra_specs_1[] = { ESP_EXTRA_SPECS, EXTRA_SPECS };
+ static struct spec_list *extra_specs = (struct spec_list *) 0;
+-#endif
+
+ /* List of dynamically allocates specs that have been defined so far. */
+
+@@ -1798,7 +1809,6 @@
+ if (verbose_flag)
+ notice ("Using built-in specs.\n");
+
+-#ifdef EXTRA_SPECS
+ extra_specs = XCNEWVEC (struct spec_list, ARRAY_SIZE (extra_specs_1));
+
+ for (i = ARRAY_SIZE (extra_specs_1) - 1; i >= 0; i--)
+@@ -1811,7 +1821,6 @@
+ sl->ptr_spec = &sl->ptr;
+ next = sl;
+ }
+-#endif
+
+ for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--)
+ {
+@@ -7111,6 +7120,12 @@
+ gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
+ spec_version, dir_separator_str, NULL);
+
++#ifdef ENABLE_ESP
++ /* Process ESP_COMMAND_OPTIONS_SPEC, adding any new options to the end
++ of the command line. */
++ do_self_spec (esp_command_options_spec);
++#endif
++
+ /* Now we have the specs.
+ Set the `valid' bits for switches that match anything in any spec. */
+
+diff -Nur gcc-4.5.0-vanilla/gcc/Makefile.in gcc-4.5.0/gcc/Makefile.in
+--- gcc-4.5.0-vanilla/gcc/Makefile.in 2010-04-02 09:49:06.000000000 +0200
++++ gcc-4.5.0/gcc/Makefile.in 2010-04-21 15:21:10.033812913 +0200
+@@ -636,13 +636,24 @@
+ INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
+ endif
+
++# We don't want __stack_chk_fail in crt* and libgcc2.a.
++# We don't want to compile crtbegin, crtend and crtbeginT with -fPIE.
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++ESP_NOPIE_CFLAGS = -fno-PIE
++ESP_NOSSP_CFLAGS = -fno-stack-protector
++else
++ESP_NOPIE_CFLAGS=
++ESP_NOSSP_CFLAGS=
++endif
++
+ # Options to use when compiling libgcc2.a.
+ #
+ LIBGCC2_DEBUG_CFLAGS = -g
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
+ $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
+ -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
+- $(INHIBIT_LIBC_CFLAGS)
++ $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
+
+ # Additional options to use when compiling libgcc2.a.
+ # Some targets override this to -isystem include
+@@ -655,7 +666,7 @@
+ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+ -finhibit-size-directive -fno-inline -fno-exceptions \
+ -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
+- $(INHIBIT_LIBC_CFLAGS)
++ $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
+
+ # Additional sources to handle exceptions; overridden by targets as needed.
+ LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
+@@ -685,6 +696,12 @@
+ # The rules for compiling them should be in the t-* file for the machine.
+ EXTRA_PARTS = @extra_parts@
+
++# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
++enable_crtbeginTS = @enable_crtbeginTS@
++ifeq ($(enable_crtbeginTS),yes)
++EXTRA_PARTS += crtbeginTS.o
++endif
++
+ # List of extra object files that should be compiled and linked with
+ # compiler proper (cc1, cc1obj, cc1plus).
+ EXTRA_OBJS = @extra_objs@
+@@ -1863,9 +1880,10 @@
+ echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
+ echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
+ echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
+- echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
++ echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars
+ echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
+ echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
++ echo enable_crtbeginTS = '$(enable_crtbeginTS)' >> tmp-libgcc.mvars
+
+ mv tmp-libgcc.mvars libgcc.mvars
+
+@@ -1899,12 +1917,14 @@
+ $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++ $(ESP_NOPIE_CFLAGS) \
+ -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
+ -o $(T)crtbegin$(objext)
+
+ $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++ $(ESP_NOPIE_CFLAGS) \
+ -c $(srcdir)/crtstuff.c -DCRT_END \
+ -o $(T)crtend$(objext)
+
+@@ -1925,9 +1945,19 @@
+ $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++ $(ESP_NOPIE_CFLAGS) \
+ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
+ -o $(T)crtbeginT$(objext)
+
++# This is a version of crtbegin for -static -fPIE links if esp is enable.
++ifeq ($(enable_crtbeginTS),yes)
++$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
++ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
++ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
++ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
++ -o $(T)crtbeginTS$(objext)
++endif
++
+ # Compile the start modules crt0.o and mcrt0.o that are linked with
+ # every program
+ $(T)crt0.o: s-crt0 ; @true
+diff -Nur gcc-4.5.0-vanilla/gcc/objc/lang-specs.h gcc-4.5.0/gcc/objc/lang-specs.h
+--- gcc-4.5.0-vanilla/gcc/objc/lang-specs.h 2007-08-02 12:37:36.000000000 +0200
++++ gcc-4.5.0/gcc/objc/lang-specs.h 2010-04-21 15:21:16.702913793 +0200
+@@ -30,13 +30,13 @@
+ %{traditional|ftraditional|traditional-cpp:\
+ %eGNU Objective C no longer supports traditional compilation}\
+ %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
+- cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
++ cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}\
+ %{!save-temps:%{!no-integrated-cpp:\
+- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
++ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {".mi", "@objc-cpp-output", 0, 0, 0},
+ {"@objc-cpp-output",
+- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {"@objective-c-header",
+ "%{E|M|MM:cc1obj -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}\
+@@ -45,10 +45,10 @@
+ %{traditional|ftraditional|traditional-cpp:\
+ %eGNU Objective C no longer supports traditional compilation}\
+ %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
+- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ cc1obj -fpreprocessed %b.mi %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ -o %g.s %{!o*:--output-pch=%i.gch}\
+ %W{o*:--output-pch=%*}%V}\
+ %{!save-temps:%{!no-integrated-cpp:\
+- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ -o %g.s %{!o*:--output-pch=%i.gch}\
+ %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
+diff -Nur gcc-4.5.0-vanilla/gcc/objcp/lang-specs.h gcc-4.5.0/gcc/objcp/lang-specs.h
+--- gcc-4.5.0-vanilla/gcc/objcp/lang-specs.h 2007-08-02 12:38:44.000000000 +0200
++++ gcc-4.5.0/gcc/objcp/lang-specs.h 2010-04-21 15:21:16.708817730 +0200
+@@ -36,7 +36,7 @@
+ %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
+ cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
+ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2 %{+e1*}\
++ %(cc1_options) %(esp_options) %2 %{+e1*}\
+ -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {"@objective-c++",
+@@ -46,15 +46,15 @@
+ %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
+ cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
+ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2 %{+e1*}\
++ %(cc1_options) %(esp_options) %2 %{+e1*}\
+ %{!fsyntax-only:%(invoke_as)}}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {".mii", "@objective-c++-cpp-output", 0, 0, 0},
+ {"@objective-c++-cpp-output",
+ "%{!M:%{!MM:%{!E:\
+- cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {"@objc++-cpp-output",
+ "%{!M:%{!MM:%{!E:\
+- cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+diff -Nur gcc-4.5.0-vanilla/gcc/varasm.c gcc-4.5.0/gcc/varasm.c
+--- gcc-4.5.0-vanilla/gcc/varasm.c 2010-03-27 12:56:30.000000000 +0100
++++ gcc-4.5.0/gcc/varasm.c 2010-04-21 15:21:16.606812404 +0200
+@@ -5961,7 +5961,11 @@
+ bool is_local;
+
+ is_local = targetm.binds_local_p (decl);
+- if (!flag_shlib)
++ #ifdef ENABLE_ESP
++ if (!flag_pic)
++ #else
++ if (!flag_shlib)
++ #endif
+ {
+ if (is_local)
+ kind = TLS_MODEL_LOCAL_EXEC;
+diff -Nur gcc-4.5.0-vanilla/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in
+--- gcc-4.5.0-vanilla/libgcc/Makefile.in 2010-03-30 15:08:52.000000000 +0200
++++ gcc-4.5.0/libgcc/Makefile.in 2010-04-21 15:21:10.824811514 +0200
+@@ -291,6 +291,12 @@
+ gen-hide-list = echo > \$@
+ endif
+
++# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
++enable_libgcc_crtbeginTS = $(enable_crtbeginTS)
++ifeq ($(enable_libgcc_crtbeginTS),yes)
++EXTRA_PARTS += crtbeginTS.o
++endif
++
+ ifneq ($(EXTRA_PARTS),)
+ extra-parts = libgcc-extra-parts
+ INSTALL_PARTS = $(EXTRA_PARTS)
+@@ -842,6 +848,13 @@
+ crtbeginT.o: $(gcc_srcdir)/crtstuff.c
+ $(crt_compile) $(CRTSTUFF_T_CFLAGS) \
+ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
++
++# This is a version of crtbegin for -static -fPIE links.
++ifeq ($(enable_libgcc_crtbeginTS),yes)
++crtbeginTS.o: $(gcc_srcdir)/crtstuff.c
++ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
++ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
++endif
+ endif
+
+ # Build extra startfiles in the libgcc directory.
+diff -Nur gcc-4.5.0-vanilla/libmudflap/configure gcc-4.5.0/libmudflap/configure
+--- gcc-4.5.0-vanilla/libmudflap/configure 2009-12-05 18:18:53.000000000 +0100
++++ gcc-4.5.0/libmudflap/configure 2010-04-21 15:21:09.843811773 +0200
+@@ -652,6 +652,7 @@
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ am__untar
++enable_esp
+ am__tar
+ AMTAR
+ am__leading_dot
+diff -Nur gcc-4.5.0-vanilla/libmudflap/Makefile.in gcc-4.5.0/libmudflap/Makefile.in
+--- gcc-4.5.0-vanilla/libmudflap/Makefile.in 2010-04-02 20:18:06.000000000 +0200
++++ gcc-4.5.0/libmudflap/Makefile.in 2010-04-21 15:21:10.844815108 +0200
+@@ -304,10 +304,18 @@
+ MAINT_CHARSET = latin1
+ SUBDIRS = testsuite
+
++# Some stuff don't compile with PIE or SSP
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++NO_ESP_CFLAGS = -fno-stack-protector -U_FORTIFY_SOURCE
++else
++NO_ESP_CFLAGS =
++endif
++
+ # May be used by various substitution variables.
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+-AM_CFLAGS = -Wall $(SECTION_FLAGS)
+-@LIBMUDFLAPTH_FALSE@libmudflapth =
++AM_CFLAGS = -Wall $(SECTION_FLAGS) $(NO_ESP_CFLAGS)
++@LIBMUDFLAPTH_FALSE@libmudflapth =
+ @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la
+ toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth)
+ libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
+diff -Nur gcc-4.5.0-vanilla/Makefile.in gcc-4.5.0/Makefile.in
+--- gcc-4.5.0-vanilla/Makefile.in 2010-02-17 12:01:44.000000000 +0100
++++ gcc-4.5.0/Makefile.in 2010-04-21 15:21:10.022812548 +0200
+@@ -350,9 +350,17 @@
+ BUILD_PREFIX = @BUILD_PREFIX@
+ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
+
++# Some stuff don't compile with SSP
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++ESP_NOSSP_CFLAGS = -fno-stack-protector
++else
++ESP_NOSSP_CFLAGS=
++endif
++
+ # Flags to pass to stage2 and later makes. They are defined
+ # here so that they can be overridden by Makefile fragments.
+-BOOT_CFLAGS= -g -O2
++BOOT_CFLAGS= -g -O2 $(ESP_NOSSP_CFLAGS)
+ BOOT_LDFLAGS=
+ BOOT_ADAFLAGS=-gnatpg -gnata
+
+@@ -397,9 +405,9 @@
+
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBCFLAGS = $(CFLAGS)
++LIBCFLAGS = $(CFLAGS) $(ESP_NOSSP_CFLAGS)
+ CXXFLAGS = @CXXFLAGS@
+-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
++LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates $(ESP_NOSSP_CFLAGS)
+
+ TFLAGS =
+
diff --git a/pkgs/core/gcc/patches/gcc-4.5.1-esp-20101030.patch b/pkgs/core/gcc/patches/gcc-4.5.1-esp-20101030.patch
deleted file mode 100644
index d9c0daa..0000000
--- a/pkgs/core/gcc/patches/gcc-4.5.1-esp-20101030.patch
+++ /dev/null
@@ -1,876 +0,0 @@
-diff -Nur gcc-4.5.1-vanilla/configure gcc-4.5.1/configure
---- gcc-4.5.1-vanilla/configure 2010-06-24 23:06:37.000000000 +0200
-+++ gcc-4.5.1/configure 2010-10-30 15:13:15.694229807 +0200
-@@ -707,6 +707,7 @@
- CFLAGS
- CC
- target_subdir
-+enable_esp
- host_subdir
- build_subdir
- build_libsubdir
-@@ -1485,6 +1486,11 @@
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-gold use gold instead of ld
- --enable-libada build libada directory
-+ --enable-esp
-+ Enable Stack protector, Position independent executable as
-+ default if we have suppot for it when compiling
-+ and link with -z relro and -z now as default.
-+ Linux targets supported i*86, x86_64, powerpc, powerpc64, ia64 and arm
- --enable-libssp build libssp directory
- --enable-build-with-cxx build with C++ compiler instead of C compiler
- --disable-ppl-version-check disable check for PPL version
-@@ -3164,6 +3170,25 @@
- noconfigdirs="$noconfigdirs gnattools"
- fi
-
-+# Check whether --enable-esp was given and target have the support.
-+# Check whether --enable-esp or --disable-esp was given.
-+if test "${enable_esp+set}" = set; then
-+ enableval="$enable_esp"
-+
-+ case $target in
-+ i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux*)
-+ enable_esp=yes
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported on this $target target." >&5
-+echo "$as_me: error: *** --enable-esp is not supported on this $target target." >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+
-+fi;
-+
-+
- # Check whether --enable-libssp was given.
- if test "${enable_libssp+set}" = set; then :
- enableval=$enable_libssp; ENABLE_LIBSSP=$enableval
-@@ -14354,6 +14379,9 @@
- *) stage1_cflags="-g -J" ;;
- esac ;;
- esac
-+if test x$enable_esp = xyes; then
-+ stage1_cflags="$stage1_cflags -fno-stack-protector"
-+fi
-
- # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
- if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
-diff -Nur gcc-4.5.1-vanilla/gcc/config/linux.h gcc-4.5.1/gcc/config/linux.h
---- gcc-4.5.1-vanilla/gcc/config/linux.h 2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.5.1/gcc/config/linux.h 2010-10-30 15:13:15.845989169 +0200
-@@ -43,7 +43,11 @@
- object constructed before entering `main'. */
-
- #undef STARTFILE_SPEC
--#if defined HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
-+#define STARTFILE_SPEC \
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s \
-+ %{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
- #define STARTFILE_SPEC \
- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-diff -Nur gcc-4.5.1-vanilla/gcc/config/rs6000/linux64.h gcc-4.5.1/gcc/config/rs6000/linux64.h
---- gcc-4.5.1-vanilla/gcc/config/rs6000/linux64.h 2010-03-17 05:44:37.000000000 +0100
-+++ gcc-4.5.1/gcc/config/rs6000/linux64.h 2010-10-30 15:13:15.843989710 +0200
-@@ -162,7 +162,7 @@
- #endif
-
- #define ASM_SPEC32 "-a32 %{n} %{T} %{Ym,*} %{Yd,*} \
--%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
-+%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} \
- %{memb} %{!memb: %{msdata=eabi: -memb}} \
- %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
- %{mcall-freebsd: -mbig} \
-diff -Nur gcc-4.5.1-vanilla/gcc/config/rs6000/sysv4.h gcc-4.5.1/gcc/config/rs6000/sysv4.h
---- gcc-4.5.1-vanilla/gcc/config/rs6000/sysv4.h 2009-11-25 21:23:20.000000000 +0100
-+++ gcc-4.5.1/gcc/config/rs6000/sysv4.h 2010-10-30 15:13:15.846988480 +0200
-@@ -883,7 +883,12 @@
- %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
- %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
-
--#ifdef HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
-+#define STARTFILE_LINUX_SPEC "\
-+%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+%{mnewlib:ecrti.o%s;:crti.o%s} \
-+%{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
- #define STARTFILE_LINUX_SPEC "\
- %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
- %{mnewlib:ecrti.o%s;:crti.o%s} \
-diff -Nur gcc-4.5.1-vanilla/gcc/config.in gcc-4.5.1/gcc/config.in
---- gcc-4.5.1-vanilla/gcc/config.in 2010-07-31 11:34:58.000000000 +0200
-+++ gcc-4.5.1/gcc/config.in 2010-10-30 15:13:15.784230669 +0200
-@@ -52,6 +52,12 @@
- #endif
-
-
-+/* Define to 1 to enable crtbeginTS.o. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_CRTBEGINTS
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
- format instead of DPD */
- #ifndef USED_FOR_TARGET
-@@ -71,6 +77,12 @@
- #endif
-
-
-+/* Define to 1 to enable esp. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_ESP
-+#endif
-+
-+
- /* Define to 1 to enable fixed-point arithmetic extension to C. */
- #ifndef USED_FOR_TARGET
- #undef ENABLE_FIXED_POINT
-diff -Nur gcc-4.5.1-vanilla/gcc/configure gcc-4.5.1/gcc/configure
---- gcc-4.5.1-vanilla/gcc/configure 2010-06-14 12:38:18.000000000 +0200
-+++ gcc-4.5.1/gcc/configure 2010-10-30 15:13:15.707229526 +0200
-@@ -680,6 +680,8 @@
- HOST_LIBS
- GGC
- libgcc_visibility
-+enable_esp
-+enable_crtbeginTS
- gcc_cv_readelf
- gcc_cv_objdump
- ORIGINAL_NM_FOR_TARGET
-@@ -24831,6 +24833,50 @@
- ;;
- esac
-
-+echo "$as_me:$LINENO: checking linker -z now support" >&5
-+echo $ECHO_N "checking linker -z now support... $ECHO_C" >&6
-+if test "${gcc_cv_ld_now+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ gcc_cv_ld_now=no
-+if test $in_tree_ld = yes ; then
-+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
-+ && test $in_tree_ld_is_elf = yes; then
-+ gcc_cv_ld_now=yes
-+ fi
-+elif test x$gcc_cv_ld != x; then
-+ # Check if linker supports -z now options
-+ if $gcc_cv_ld --help 2>/dev/null | grep now > /dev/null; then
-+ gcc_cv_ld_now=yes
-+ fi
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $gcc_cv_ld_now" >&5
-+echo "${ECHO_T}$gcc_cv_ld_now" >&6
-+
-+echo "$as_me:$LINENO: checking linker -z relro support" >&5
-+echo $ECHO_N "checking linker -z relro support... $ECHO_C" >&6
-+if test "${gcc_cv_ld_relro+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ gcc_cv_ld_relro=no
-+if test $in_tree_ld = yes ; then
-+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
-+ && test $in_tree_ld_is_elf = yes; then
-+ gcc_cv_ld_relro=yes
-+ fi
-+elif test x$gcc_cv_ld != x; then
-+ # Check if linker supports -z relro and -z norelro options
-+ if $gcc_cv_ld --help 2>/dev/null | grep relro > /dev/null; then
-+ gcc_cv_ld_relro=yes
-+ fi
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $gcc_cv_ld_relro" >&5
-+echo "${ECHO_T}$gcc_cv_ld_relro" >&6
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --build-id support" >&5
- $as_echo_n "checking linker --build-id support... " >&6; }
- if test "${gcc_cv_ld_buildid+set}" = set; then :
-@@ -25014,6 +25060,74 @@
-
- fi
-
-+if test x$enable_esp = xyes ; then
-+case $target in
-+ ia64*-*-linux*)
-+ if test x$gcc_cv_ld_now = xyes; then
-+ enable_esp_ld=yes
-+ else
-+ enable_esp_ld=no
-+ fi
-+ ;;
-+ *-*-linux*)
-+ if test x$gcc_cv_ld_relro = xyes && test x$gcc_cv_ld_now = xyes; then
-+ enable_esp_ld=yes
-+ else
-+ enable_esp_ld=no
-+ fi
-+ ;;
-+ *)
-+ enable_esp_ld=no
-+ ;;
-+ esac
-+else
-+ enable_espf_ld=no
-+fi
-+if test x$enable_esp_ld = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_ESP 1
-+_ACEOF
-+
-+fi
-+
-+if test x$enable_esp = xyes && test x$enable_esp_ld = xno; then
-+ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&5
-+echo "$as_me: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+echo "$as_me:$LINENO: checking for crtbeginTS.o support" >&5
-+echo $ECHO_N "checking for crtbeginTS.o support... $ECHO_C" >&6
-+if test "${enable_crtbeginTS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test x$enable_esp = xyes ; then
-+ case "$target" in
-+ ia64*-*-linux*)
-+ enable_crtbeginTS=no ;;
-+ *-*-linux*)
-+ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then
-+ enable_crtbeginTS=yes
-+ fi
-+ ;;
-+ *) enable_crtbeginTS=no ;;
-+ esac
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $enable_crtbeginTS" >&5
-+echo "${ECHO_T}$enable_crtbeginTS" >&6
-+
-+if test x$enable_crtbeginTS = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_CRTBEGINTS 1
-+_ACEOF
-+
-+fi
-+
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
- # and later they can use TFmode.
-diff -Nur gcc-4.5.1-vanilla/gcc/cp/lang-specs.h gcc-4.5.1/gcc/cp/lang-specs.h
---- gcc-4.5.1-vanilla/gcc/cp/lang-specs.h 2007-08-06 13:10:19.000000000 +0200
-+++ gcc-4.5.1/gcc/cp/lang-specs.h 2010-10-30 15:13:15.849979777 +0200
-@@ -47,7 +47,7 @@
- %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
- cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
- %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2 %{+e1*}\
-+ %(cc1_options) %(esp_options) %2 %{+e1*}\
- %{!fsyntax-only:-o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {"@c++",
-@@ -57,11 +57,11 @@
- %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
- cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
- %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2 %{+e1*}\
-+ %(cc1_options) %(esp_options) %2 %{+e1*}\
- %{!fsyntax-only:%(invoke_as)}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {".ii", "@c++-cpp-output", 0, 0, 0},
- {"@c++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
-+ cc1plus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-diff -Nur gcc-4.5.1-vanilla/gcc/doc/invoke.texi gcc-4.5.1/gcc/doc/invoke.texi
---- gcc-4.5.1-vanilla/gcc/doc/invoke.texi 2010-04-06 16:02:22.000000000 +0200
-+++ gcc-4.5.1/gcc/doc/invoke.texi 2010-10-30 15:13:15.864979490 +0200
-@@ -7856,6 +7856,11 @@
- @opindex fstack-protector-all
- Like @option{-fstack-protector} except that all functions are protected.
-
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}
-+or @option{-nostdlib} or @option{-nodefaultlibs} or
-+@option{-fstack-protector} are found.
-+
- @item -fsection-anchors
- @opindex fsection-anchors
- Try to reduce the number of symbolic address calculations by using
-@@ -8705,6 +8710,12 @@
- that were used to generate code (@option{-fpie}, @option{-fPIE},
- or model suboptions) when you specify this option.
-
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
-+or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
-+@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p}
-+are found.
-+
- @item -rdynamic
- @opindex rdynamic
- Pass the flag @option{-export-dynamic} to the ELF linker, on targets
-@@ -17251,6 +17262,11 @@
- @code{__pie__} and @code{__PIE__}. The macros have the value 1
- for @option{-fpie} and 2 for @option{-fPIE}.
-
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
-+or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
-+@option{-nostartfiles} or @option{-shared} are found.
-+
- @item -fno-jump-tables
- @opindex fno-jump-tables
- Do not use jump tables for switch statements even where it would be
-diff -Nur gcc-4.5.1-vanilla/gcc/esp.h gcc-4.5.1/gcc/esp.h
---- gcc-4.5.1-vanilla/gcc/esp.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.1/gcc/esp.h 2010-10-30 15:13:15.841979565 +0200
-@@ -0,0 +1,145 @@
-+/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
-+ * Version 20100527.1
-+ * Magnus Granberg (Zorry) <zorry(a)gentoo.org> */
-+#ifndef GCC_ESP_H
-+#define GCC_ESP_H
-+
-+/* This file will add -fstack-protector-all, -fPIE, -pie and -z now
-+ as default if the defines and the spec allow it.
-+ Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
-+ to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
-+ This will add some unsupported upstream commands options as -nopie and -nonow.
-+ -D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all when building kernels.
-+ ESP_CC1_SPEC is added to CC1_SPEC.
-+ ESP_CC1_STRICT_OVERFLOW_SPEC is added so we don't disable the strict-overflow check.
-+ ESP_LINK_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile and -static.
-+ ENABLE_CRTBEGINTS add support for crtbeginTS.o, build -static with -fPIE or -fpie.
-+*/
-+#ifdef ENABLE_ESP
-+
-+ /* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass */
-+ #define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)"
-+ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
-+ #else
-+ #define ESP_CC1_SSP_SPEC ""
-+ #endif
-+ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+ #define ESP_CC1_PIE_SPEC "%{!nopie: }"
-+ #else
-+ #define ESP_CC1_PIE_SPEC ""
-+ #endif
-+ #define ESP_CC1_STRICT_OVERFLOW_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
-+
-+ /* ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
-+ -z now will be added if we don't have -vanilla spec. We do a -pie incompatible check
-+ Don't remove the specs in the end */
-+ #define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
-+ #define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
-+
-+ /* We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options. */
-+ #define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
-+
-+ /* ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c */
-+ #define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
-+
-+ /* ESP_CPP_OPTIONS_SPEC is added to the cpp_options spec in gcc/gcc.c
-+ For precompiling headers. */
-+ #define ESP_CPP_OPTIONS_SPEC "%(esp_options_ssp)"
-+
-+ /* This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
-+ -fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined. */
-+ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+ #define ESP_OPTIONS_SSP_SPEC \
-+ "%{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector: \
-+ %{!fstack-protector:%{!fstack-protector-all:-fstack-protector-all}}}}}}"
-+ #else
-+ #define ESP_OPTIONS_SSP_SPEC ""
-+ #endif
-+
-+ /* If EFAULT_PIE or EFAULT_PIE_SSP is defined we will add -fPIE -pie */
-+ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+
-+ /* This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
-+ -nostdlib -nostartfiles. */
-+ /* With ENABLE_CRTBEGINTS we don't need to check for -static */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define ESP_OPTIONS_PIE_SPEC \
-+ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+ %{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
-+ #else
-+ #define ESP_OPTIONS_PIE_SPEC \
-+ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+ %{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
-+ #endif
-+
-+ /* This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib
-+ -nostartfiles */
-+ /* With ENABLE_CRTBEGINTS we don't need to check for -static
-+ and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define ESP_LINK_PIE_SPEC \
-+ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
-+ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
-+ #else
-+ #define ESP_LINK_PIE_SPEC \
-+ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
-+ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
-+ #endif
-+
-+ /* This will check if -pie is set when (-static) -pg -p -profile. If set it will make gcc print out
-+ "-pie and (static)|pg|p|profile are incompatible when linking" */
-+ /* With ENABLE_CRTBEGINTS we don't need to check for -static */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define ESP_LINK_PIE_CHECK_SPEC \
-+ "%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible when linking}}"
-+ #else
-+ #define ESP_LINK_PIE_CHECK_SPEC \
-+ "%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible when linking}}"
-+ #endif
-+
-+ /* We don't pass -pie to the linker when -static. */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link)"
-+ #else
-+ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+ #endif
-+
-+ #else
-+ #define ESP_OPTIONS_PIE_SPEC ""
-+ #define ESP_LINK_PIE_CHECK_SPEC ""
-+ #define ESP_LINK_PIE_SPEC ""
-+ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+ #endif
-+
-+ /* We add extra spec name's to the EXTRA_SPECS list */
-+ #define ESP_EXTRA_SPECS \
-+ { "esp_cc1", ESP_CC1_SPEC }, \
-+ { "esp_cc1_pie", ESP_CC1_PIE_SPEC }, \
-+ { "esp_cc1_ssp", ESP_CC1_SSP_SPEC }, \
-+ { "esp_cc1_strict_overflow", ESP_CC1_STRICT_OVERFLOW_SPEC }, \
-+ { "esp_link", ESP_LINK_SPEC }, \
-+ { "esp_link_now", ESP_LINK_NOW_SPEC }, \
-+ { "esp_link_pie", ESP_LINK_PIE_SPEC }, \
-+ { "esp_link_pie_check", ESP_LINK_PIE_CHECK_SPEC }, \
-+ { "esp_command_options", ESP_COMMAND_OPTIONS_SPEC }, \
-+ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }, \
-+ { "esp_options", ESP_OPTIONS_SPEC }, \
-+ { "esp_options_pie", ESP_OPTIONS_PIE_SPEC }, \
-+ { "esp_options_ssp", ESP_OPTIONS_SSP_SPEC }
-+
-+ static const char *esp_command_options_spec = ESP_COMMAND_OPTIONS_SPEC;
-+ static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
-+
-+#else /* If not ESP_ENABLE defined do this. */
-+
-+ #define ESP_OPTIONS_SPEC ""
-+ #define ESP_CPP_OPTIONS_SPEC ""
-+
-+ /* We add extra spec name's to the EXTRA_SPECS list */
-+ #define ESP_EXTRA_SPECS \
-+ { "esp_options", ESP_OPTIONS_SPEC }, \
-+ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }
-+
-+#endif
-+#endif /* End GCC_ESP_H */
-diff -Nur gcc-4.5.1-vanilla/gcc/gcc.c gcc-4.5.1/gcc/gcc.c
---- gcc-4.5.1-vanilla/gcc/gcc.c 2010-04-18 19:46:08.000000000 +0200
-+++ gcc-4.5.1/gcc/gcc.c 2010-10-30 15:13:15.834979921 +0200
-@@ -84,6 +84,7 @@
- #include "gcc.h"
- #include "flags.h"
- #include "opts.h"
-+#include "esp.h" /* for --enable-esp support */
-
- #ifdef HAVE_MMAP_FILE
- # include <sys/mman.h>
-@@ -822,7 +823,9 @@
-
- static const char *asm_debug;
- static const char *cpp_spec = CPP_SPEC;
-+#ifndef ENABLE_ESP
- static const char *cc1_spec = CC1_SPEC;
-+#endif
- static const char *cc1plus_spec = CC1PLUS_SPEC;
- static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
- static const char *link_ssp_spec = LINK_SSP_SPEC;
-@@ -885,7 +888,7 @@
- static const char *cpp_options =
- "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
- %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
-- %{undef} %{save-temps*:-fpch-preprocess}";
-+ %{undef} %{save-temps*:-fpch-preprocess} %(esp_cpp_options)";
-
- /* This contains cpp options which are not passed when the preprocessor
- output will be used by another program. */
-@@ -1075,15 +1078,15 @@
- %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
- %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
- cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
-- %(cc1_options)}\
-+ %(cc1_options) %(esp_options)}\
- %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
-- cc1 %(cpp_unique_options) %(cc1_options)}}}\
-+ cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}}\
- %{!fsyntax-only:%(invoke_as)}} \
- %{combine:\
- %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
- %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i}}\
- %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
-- cc1 %(cpp_unique_options) %(cc1_options)}}\
-+ cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}\
- %{!fsyntax-only:%(invoke_as)}}}}}}", 0, 1, 1},
- {"-",
- "%{!E:%e-E or -x required when input is from standard input}\
-@@ -1106,7 +1109,7 @@
- %W{o*:--output-pch=%*}%V}}}}}}", 0, 0, 0},
- {".i", "@cpp-output", 0, 1, 0},
- {"@cpp-output",
-- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
-+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(esp_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
- {".s", "@assembler", 0, 1, 0},
- {"@assembler",
- "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0},
-@@ -1699,18 +1702,23 @@
- INIT_STATIC_SPEC ("sysroot_hdrs_suffix_spec", &sysroot_hdrs_suffix_spec),
- };
-
--#ifdef EXTRA_SPECS /* additional specs needed */
-+/* EXTRA_SPECS needs to be defined */
-+#ifndef EXTRA_SPECS
-+#define EXTRA_SPECS
-+#endif
-+
-+/* EXTRA_SPECS and ESP_EXTRA_SPECS add additional specs */
- /* Structure to keep track of just the first two args of a spec_list.
-- That is all that the EXTRA_SPECS macro gives us. */
-+ That is all that the EXTRA_SPECS and ESP_EXTRA_SPECS macro gives us. */
- struct spec_list_1
- {
- const char *const name;
- const char *const ptr;
- };
-
--static const struct spec_list_1 extra_specs_1[] = { EXTRA_SPECS };
-+/* ESP_EXTRA_SPECS before EXTRA_SPECS */
-+static const struct spec_list_1 extra_specs_1[] = { ESP_EXTRA_SPECS, EXTRA_SPECS };
- static struct spec_list *extra_specs = (struct spec_list *) 0;
--#endif
-
- /* List of dynamically allocates specs that have been defined so far. */
-
-@@ -1798,7 +1806,6 @@
- if (verbose_flag)
- notice ("Using built-in specs.\n");
-
--#ifdef EXTRA_SPECS
- extra_specs = XCNEWVEC (struct spec_list, ARRAY_SIZE (extra_specs_1));
-
- for (i = ARRAY_SIZE (extra_specs_1) - 1; i >= 0; i--)
-@@ -1811,7 +1818,6 @@
- sl->ptr_spec = &sl->ptr;
- next = sl;
- }
--#endif
-
- for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--)
- {
-@@ -7111,6 +7117,12 @@
- gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
-
-+#ifdef ENABLE_ESP
-+ /* Process ESP_COMMAND_OPTIONS_SPEC, adding any new options to the end
-+ of the command line. */
-+ do_self_spec (esp_command_options_spec);
-+#endif
-+
- /* Now we have the specs.
- Set the `valid' bits for switches that match anything in any spec. */
-
-diff -Nur gcc-4.5.1-vanilla/gcc/Makefile.in gcc-4.5.1/gcc/Makefile.in
---- gcc-4.5.1-vanilla/gcc/Makefile.in 2010-06-30 15:26:17.000000000 +0200
-+++ gcc-4.5.1/gcc/Makefile.in 2010-10-30 15:13:15.822979675 +0200
-@@ -640,13 +640,24 @@
- INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
- endif
-
-+# We don't want __stack_chk_fail in crt* and libgcc2.a.
-+# We don't want to compile crtbegin, crtend and crtbeginT with -fPIE.
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOPIE_CFLAGS = -fno-PIE
-+ESP_NOSSP_CFLAGS = -fno-stack-protector
-+else
-+ESP_NOPIE_CFLAGS=
-+ESP_NOSSP_CFLAGS=
-+endif
-+
- # Options to use when compiling libgcc2.a.
- #
- LIBGCC2_DEBUG_CFLAGS = -g
- LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
- $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
- -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
-- $(INHIBIT_LIBC_CFLAGS)
-+ $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
-
- # Additional options to use when compiling libgcc2.a.
- # Some targets override this to -isystem include
-@@ -659,7 +670,7 @@
- CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
- -finhibit-size-directive -fno-inline -fno-exceptions \
- -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
-- $(INHIBIT_LIBC_CFLAGS)
-+ $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
-
- # Additional sources to handle exceptions; overridden by targets as needed.
- LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
-@@ -689,6 +700,12 @@
- # The rules for compiling them should be in the t-* file for the machine.
- EXTRA_PARTS = @extra_parts@
-
-+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
-+enable_crtbeginTS = @enable_crtbeginTS@
-+ifeq ($(enable_crtbeginTS),yes)
-+EXTRA_PARTS += crtbeginTS.o
-+endif
-+
- # List of extra object files that should be compiled and linked with
- # compiler proper (cc1, cc1obj, cc1plus).
- EXTRA_OBJS = @extra_objs@
-@@ -1867,9 +1884,10 @@
- echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
- echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
- echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
-- echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
-+ echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars
- echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
- echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
-+ echo enable_crtbeginTS = '$(enable_crtbeginTS)' >> tmp-libgcc.mvars
-
- mv tmp-libgcc.mvars libgcc.mvars
-
-@@ -1903,12 +1921,14 @@
- $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(ESP_NOPIE_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
- -o $(T)crtbegin$(objext)
-
- $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(ESP_NOPIE_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_END \
- -o $(T)crtend$(objext)
-
-@@ -1929,9 +1949,19 @@
- $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(ESP_NOPIE_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
- -o $(T)crtbeginT$(objext)
-
-+# This is a version of crtbegin for -static -fPIE links if esp is enable.
-+ifeq ($(enable_crtbeginTS),yes)
-+$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-+ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
-+ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
-+ -o $(T)crtbeginTS$(objext)
-+endif
-+
- # Compile the start modules crt0.o and mcrt0.o that are linked with
- # every program
- $(T)crt0.o: s-crt0 ; @true
-diff -Nur gcc-4.5.1-vanilla/gcc/objc/lang-specs.h gcc-4.5.1/gcc/objc/lang-specs.h
---- gcc-4.5.1-vanilla/gcc/objc/lang-specs.h 2007-08-02 12:37:36.000000000 +0200
-+++ gcc-4.5.1/gcc/objc/lang-specs.h 2010-10-30 15:13:15.851989223 +0200
-@@ -30,13 +30,13 @@
- %{traditional|ftraditional|traditional-cpp:\
- %eGNU Objective C no longer supports traditional compilation}\
- %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
-- cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
-+ cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}\
- %{!save-temps:%{!no-integrated-cpp:\
-- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
-+ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {".mi", "@objc-cpp-output", 0, 0, 0},
- {"@objc-cpp-output",
-- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objective-c-header",
- "%{E|M|MM:cc1obj -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}\
-@@ -45,10 +45,10 @@
- %{traditional|ftraditional|traditional-cpp:\
- %eGNU Objective C no longer supports traditional compilation}\
- %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
-- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ cc1obj -fpreprocessed %b.mi %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- -o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}%V}\
- %{!save-temps:%{!no-integrated-cpp:\
-- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- -o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
-diff -Nur gcc-4.5.1-vanilla/gcc/objcp/lang-specs.h gcc-4.5.1/gcc/objcp/lang-specs.h
---- gcc-4.5.1-vanilla/gcc/objcp/lang-specs.h 2007-08-02 12:38:44.000000000 +0200
-+++ gcc-4.5.1/gcc/objcp/lang-specs.h 2010-10-30 15:13:15.852989302 +0200
-@@ -36,7 +36,7 @@
- %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
- cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
- %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2 %{+e1*}\
-+ %(cc1_options) %(esp_options) %2 %{+e1*}\
- -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {"@objective-c++",
-@@ -46,15 +46,15 @@
- %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
- cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
- %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2 %{+e1*}\
-+ %(cc1_options) %(esp_options) %2 %{+e1*}\
- %{!fsyntax-only:%(invoke_as)}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {".mii", "@objective-c++-cpp-output", 0, 0, 0},
- {"@objective-c++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
-+ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objc++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
-+ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-diff -Nur gcc-4.5.1-vanilla/gcc/varasm.c gcc-4.5.1/gcc/varasm.c
---- gcc-4.5.1-vanilla/gcc/varasm.c 2010-03-27 12:56:30.000000000 +0100
-+++ gcc-4.5.1/gcc/varasm.c 2010-10-30 15:13:15.839995541 +0200
-@@ -5961,7 +5961,11 @@
- bool is_local;
-
- is_local = targetm.binds_local_p (decl);
-- if (!flag_shlib)
-+ #ifdef ENABLE_ESP
-+ if (!flag_pic)
-+ #else
-+ if (!flag_shlib)
-+ #endif
- {
- if (is_local)
- kind = TLS_MODEL_LOCAL_EXEC;
-diff -Nur gcc-4.5.1-vanilla/libgcc/Makefile.in gcc-4.5.1/libgcc/Makefile.in
---- gcc-4.5.1-vanilla/libgcc/Makefile.in 2010-03-30 15:08:52.000000000 +0200
-+++ gcc-4.5.1/libgcc/Makefile.in 2010-10-30 15:13:15.824991986 +0200
-@@ -291,6 +291,12 @@
- gen-hide-list = echo > \$@
- endif
-
-+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
-+enable_libgcc_crtbeginTS = $(enable_crtbeginTS)
-+ifeq ($(enable_libgcc_crtbeginTS),yes)
-+EXTRA_PARTS += crtbeginTS.o
-+endif
-+
- ifneq ($(EXTRA_PARTS),)
- extra-parts = libgcc-extra-parts
- INSTALL_PARTS = $(EXTRA_PARTS)
-@@ -842,6 +848,13 @@
- crtbeginT.o: $(gcc_srcdir)/crtstuff.c
- $(crt_compile) $(CRTSTUFF_T_CFLAGS) \
- -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
-+
-+# This is a version of crtbegin for -static -fPIE links.
-+ifeq ($(enable_libgcc_crtbeginTS),yes)
-+crtbeginTS.o: $(gcc_srcdir)/crtstuff.c
-+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
-+ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
-+endif
- endif
-
- # Build extra startfiles in the libgcc directory.
-diff -Nur gcc-4.5.1-vanilla/libmudflap/configure gcc-4.5.1/libmudflap/configure
---- gcc-4.5.1-vanilla/libmudflap/configure 2010-06-10 10:58:13.000000000 +0200
-+++ gcc-4.5.1/libmudflap/configure 2010-10-30 15:13:15.768230485 +0200
-@@ -652,6 +652,7 @@
- MAINTAINER_MODE_FALSE
- MAINTAINER_MODE_TRUE
- am__untar
-+enable_esp
- am__tar
- AMTAR
- am__leading_dot
-diff -Nur gcc-4.5.1-vanilla/libmudflap/Makefile.in gcc-4.5.1/libmudflap/Makefile.in
---- gcc-4.5.1-vanilla/libmudflap/Makefile.in 2010-04-02 20:18:06.000000000 +0200
-+++ gcc-4.5.1/libmudflap/Makefile.in 2010-10-30 15:13:15.826989769 +0200
-@@ -304,9 +304,17 @@
- MAINT_CHARSET = latin1
- SUBDIRS = testsuite
-
-+# Some stuff don't compile with SSP and FORTIFY_SOURCE
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ NO_ESP_CFLAGS = -fno-stack-protector -U_FORTIFY_SOURCE
-+else
-+ NO_ESP_CFLAGS =
-+endif
-+
- # May be used by various substitution variables.
- gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
--AM_CFLAGS = -Wall $(SECTION_FLAGS)
-+AM_CFLAGS = -Wall $(SECTION_FLAGS) $(NO_ESP_CFLAGS)
- @LIBMUDFLAPTH_FALSE@libmudflapth =
- @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la
- toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth)
-diff -Nur gcc-4.5.1-vanilla/Makefile.in gcc-4.5.1/Makefile.in
---- gcc-4.5.1-vanilla/Makefile.in 2010-06-10 19:05:59.000000000 +0200
-+++ gcc-4.5.1/Makefile.in 2010-10-30 15:13:15.816979901 +0200
-@@ -350,9 +350,17 @@
- BUILD_PREFIX = @BUILD_PREFIX@
- BUILD_PREFIX_1 = @BUILD_PREFIX_1@
-
-+# Some stuff don't compile with SSP
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOSSP_CFLAGS = -fno-stack-protector
-+else
-+ESP_NOSSP_CFLAGS=
-+endif
-+
- # Flags to pass to stage2 and later makes. They are defined
- # here so that they can be overridden by Makefile fragments.
--BOOT_CFLAGS= -g -O2
-+BOOT_CFLAGS= -g -O2 $(ESP_NOSSP_CFLAGS)
- BOOT_LDFLAGS=
- BOOT_ADAFLAGS=-gnatpg -gnata
-
-@@ -397,9 +405,9 @@
-
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBCFLAGS = $(CFLAGS)
-+LIBCFLAGS = $(CFLAGS) $(ESP_NOSSP_CFLAGS)
- CXXFLAGS = @CXXFLAGS@
--LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates $(ESP_NOSSP_CFLAGS)
-
- TFLAGS =
-
diff --git a/pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch b/pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch
new file mode 100644
index 0000000..1382a1b
--- /dev/null
+++ b/pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch
@@ -0,0 +1,27 @@
+libtool sucks.
+--- a/ltmain.sh.jj 2007-12-07 14:53:21.000000000 +0100
++++ b/ltmain.sh 2008-09-05 21:51:48.000000000 +0200
+@@ -5394,6 +5394,7 @@ EOF
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+@@ -6071,6 +6072,7 @@ EOF
+ rpath=
+ hardcode_libdirs=
+ for libdir in $compile_rpath $finalize_rpath; do
++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+@@ -6120,6 +6122,7 @@ EOF
+ rpath=
+ hardcode_libdirs=
+ for libdir in $finalize_rpath; do
++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
diff --git a/pkgs/core/openssh/openssh.nm b/pkgs/core/openssh/openssh.nm
index cd197af..1176202 100644
--- a/pkgs/core/openssh/openssh.nm
+++ b/pkgs/core/openssh/openssh.nm
@@ -35,6 +35,7 @@ PKG_LICENSE = MIT
PKG_SUMMARY = An open source implementation of SSH protocol versions 1 and 2.
PKG_BUILD_DEPS+= openssl-devel pam-devel
+PKG_DEPS-openssh = openssh-clients=$(THISVER) openssh-server=$(THISVER)
define PKG_DESCRIPTION
SH (Secure SHell) is a program for logging into and executing \
@@ -45,6 +46,32 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
+PKG_PACKAGES += openssh-clients openssh-server
+
+PKG_SUMMARY-openssh-server = OpenSSH server applications.
+PKG_DESCRIPTION-openssh-server = $(PKG_SUMMARY-openssh-server)
+PKG_FILES-openssh-server = \
+ /etc/init/ \
+ /etc/pam.d/ \
+ /etc/ssh/moduli \
+ /etc/ssh/sshd_config \
+ /usr/lib/openssh/sftp-server \
+ /usr/sbin/ \
+ /usr/share/man/cat5/sshd_config.5* \
+ /usr/share/man/cat5/moduli.5* \
+ /usr/share/man/cat8/sshd.8* \
+ /usr/share/man/cat8/sftp-server.8* \
+ /usr/share/sshd/ \
+ /var/
+
+PKG_SUMMARY-openssh-clients = OpenSSH client applications.
+PKG_DESCRIPTION-openssh-clients = $(PKG_SUMMARY-openssh-clients)
+PKG_FILES-openssh-clients = \
+ /etc/ \
+ /usr/bin/ \
+ /usr/lib/ \
+ /usr/share/
+
CONFIGURE_OPTIONS += \
--sysconfdir=/etc/ssh \
--datadir=/usr/share/sshd \
diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm
index b885b92..7659194 100644
--- a/pkgs/core/pyQt/pyQt.nm
+++ b/pkgs/core/pyQt/pyQt.nm
@@ -25,9 +25,9 @@
include $(PKGROOT)/Include
PKG_NAME = pyQt
-PKG_VER = 4.8
+PKG_VER = 4.8.1
PKG_REL = 0
-PKG_EPOCH = 1
+PKG_EPOCH = 0
PKG_MAINTAINER =
PKG_GROUP = Development/Languages
@@ -57,6 +57,7 @@ DIR_APP = $(DIR_SRC)/PyQt-x11-gpl-$(PKG_VER)
define STAGE_BUILD
cd $(DIR_APP) && python configure.py \
+ --assume-shared \
--confirm-license \
--verbose
diff --git a/pkgs/core/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch b/pkgs/core/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
new file mode 100644
index 0000000..bb2588d
--- /dev/null
+++ b/pkgs/core/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
@@ -0,0 +1,67 @@
+From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
+From: Lubos Lunak <l.lunak(a)kde.org>
+Date: Tue, 2 Oct 2007 16:08:32 +0200
+Subject: [PATCH 02/13] This patch makes override-redirect windows (popup menu, dropdown menu,
+ tooltip, combobox, etc.) also have more window properties like WM_CLASS,
+ so they can be used when compositing.
+
+qt-bugs@ issue : none
+bugs.kde.org number : none
+---
+ src/gui/kernel/qwidget_x11.cpp | 21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
+index 79ee8c9..a74a849 100644
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+ Q_ASSERT(id);
+ XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
+ &wsa);
++ XClassHint class_hint;
++ QByteArray appName = qAppName().toLatin1();
++ class_hint.res_name = appName.data(); // application name
++ class_hint.res_class = const_cast<char *>(QX11Info::appClass()); // application class
++ XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
+ } else if (topLevel && !desktop) { // top-level widget
+ if (!X11->wm_client_leader)
+ create_wm_client_leader();
+@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+ // set EWMH window types
+ setNetWmWindowTypes();
+
++ // when we create a toplevel widget, the frame strut should be dirty
++ data.fstrut_dirty = 1;
++
++ } else {
++ // non-toplevel widgets don't have a frame, so no need to
++ // update the strut
++ data.fstrut_dirty = 0;
++ }
++
++ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
+ // set _NET_WM_PID
+ long curr_pid = getpid();
+ XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
+ (unsigned char *) &curr_pid, 1);
+
+- // when we create a toplevel widget, the frame strut should be dirty
+- data.fstrut_dirty = 1;
+
+ // declare the widget's window role
+ if (QTLWExtra *topData = maybeTopData()) {
+@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+ XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
+ XA_WINDOW, 32, PropModeReplace,
+ (unsigned char *)&X11->wm_client_leader, 1);
+- } else {
+- // non-toplevel widgets don't have a frame, so no need to
+- // update the strut
+- data.fstrut_dirty = 0;
+ }
+
+ if (initializeWindow && q->internalWinId()) {
+--
+1.6.5.1
+
diff --git a/pkgs/core/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch b/pkgs/core/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
new file mode 100644
index 0000000..4005734
--- /dev/null
+++ b/pkgs/core/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
@@ -0,0 +1,56 @@
+From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
+From: Benjamin Reed <rangerrick(a)befunk.com>
+Date: Tue, 19 Feb 2008 17:37:37 +0100
+Subject: [PATCH 04/13] This patch adds support for using -isystem to allow putting an include
+ directory at the end of the compiler's header search path.
+
+I don't have the exact output anymore (I've since patched Qt's configure) but
+essentially, since I have pcre.h in /opt/kde4-deps/include, it was
+conflicting with Qt's (modified) pcre.h in the WebKit bits, since
+-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
+comes *before* the specific locations in INCPATH on the compile line, and you
+end up with a conflict with the system-installed pcre.h.
+
+Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
+wouldn't notice this issue since /usr/include's already in your include path
+and people likely don't pass -I /usr/include to configure. I suspect that on
+any platform with a regular, system-installed pcre.h (or clucene headers),
+adding -I /usr/include would exhibit this bug, just as a custom-installed
+pcre/clucene in another root would.
+
+qt-bugs@ issue : 199610
+Trolltech task ID :
+bugs.kde.org number :
+---
+ configure | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index 2c108ad..610a201 100755
+--- a/configure
++++ b/configure
+@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
+ VAL=`echo $1 | sed 's,-D,,'`
+ fi
+ ;;
++ -isystem)
++ VAR="add_isystempath"
++ shift
++ VAL="$1"
++ ;;
+ -I?*|-I)
+ VAR="add_ipath"
+ if [ "$1" = "-I" ]; then
+@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
+ add_ipath)
+ I_FLAGS="$I_FLAGS -I\"${VAL}\""
+ ;;
++ add_isystempath)
++ I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
++ ;;
+ add_lpath)
+ L_FLAGS="$L_FLAGS -L\"${VAL}\""
+ ;;
+--
+1.6.5.1
+
diff --git a/pkgs/core/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch b/pkgs/core/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
new file mode 100644
index 0000000..0386a47
--- /dev/null
+++ b/pkgs/core/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
@@ -0,0 +1,47 @@
+From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
+From: Robert Knight <robertknight(a)gmail.com>
+Date: Sun, 20 Apr 2008 16:28:31 +0200
+Subject: [PATCH 05/13] When tabs are inserted or removed in a QTabBar,
+ QTabBarPrivate::refresh() is called to update the layout. If the
+ tabbar widget is hidden, this just sets a boolean variable
+ (layoutDirty) and returns, so the parent widget's layout is not
+ notified about the possible geometry change.
+
+Prior to Qt 4.4 this was not a problem because the geometry was
+recalculated in QTabBar::sizeHint() if the layoutDirty variable was
+set. In Qt 4.4 however the layout caches size hint information in
+QWidgetItemV2. Since the cache information is not invalidated, the
+layout may end up using out-of-date size hint information to compute
+the widget size.
+
+If the QTabBar is empty when QTabBar::sizeHint() is called, it will
+return a size with a height of 0, which will be kept in the cache and
+so the tab bar will never be shown.
+
+This patch fixes the problem by calling updateGeometry() whenever the
+tab bar's layout is refreshed.
+
+qt-bugs@ issue : 208185
+Trolltech task ID : 208349
+bugs.kde.org number : 159014
+---
+ src/gui/widgets/qtabbar.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
+index 419d456..41107a0 100644
+--- a/src/gui/widgets/qtabbar.cpp
++++ b/src/gui/widgets/qtabbar.cpp
+@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
+ layoutTabs();
+ makeVisible(currentIndex);
+ q->update();
+- q->updateGeometry();
+ }
++ q->updateGeometry();
+ }
+
+ /*!
+--
+1.6.5.1
+
diff --git a/pkgs/core/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch b/pkgs/core/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
new file mode 100644
index 0000000..2b552d3
--- /dev/null
+++ b/pkgs/core/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
@@ -0,0 +1,70 @@
+From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid(a)kde.org>
+Date: Sat, 8 Aug 2009 14:40:25 +0200
+Subject: [PATCH 12/13] Add context to tr calls in QShortcut
+
+Some languages have special rules for using "+" to concatenate strings and
+for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
+context to these strings helps creating a more correct translation
+---
+ src/gui/kernel/qkeysequence.cpp | 20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
+index 894f663..c17f253 100644
+--- a/src/gui/kernel/qkeysequence.cpp
++++ b/src/gui/kernel/qkeysequence.cpp
+@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
+
+ QList<QModifKeyName> modifs;
+ if (nativeText) {
+- modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
+- << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
+- << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
+- << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
++ modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
++ << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
++ << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
++ << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
+ }
+ modifs += *gmodifs; // Test non-translated ones last
+
+@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
+ static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
+ {
+ if (!str.isEmpty())
+- str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
++ str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
+ : QString::fromLatin1("+");
+ str += theKey;
+ }
+@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
+ {
+ // On other systems the order is Meta, Control, Alt, Shift
+ if ((key & Qt::META) == Qt::META)
+- s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
++ s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
+ if ((key & Qt::CTRL) == Qt::CTRL)
+- addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
++ addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
+ if ((key & Qt::ALT) == Qt::ALT)
+- addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
++ addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
+ if ((key & Qt::SHIFT) == Qt::SHIFT)
+- addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
++ addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
+ }
+
+
+@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
+ p += QChar((key-0x10000)%400+0xdc00);
+ }
+ } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
+- p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
++ p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
+ : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
+ } else if (key) {
+ int i=0;
+--
+1.6.5.1
+
diff --git a/pkgs/core/qt/patches/qt b/pkgs/core/qt/patches/qt
new file mode 160000
index 0000000..76078ae
--- /dev/null
+++ b/pkgs/core/qt/patches/qt
@@ -0,0 +1 @@
+Subproject commit 76078aea2e778defe516b39bd4367dedd4a71ca5
diff --git a/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch b/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
new file mode 100644
index 0000000..0e562e4
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
@@ -0,0 +1,15 @@
+diff -rup qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-02 07:33:13.000000000 +0530
++++ qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-04 13:27:33.000000000 +0530
+@@ -1741,6 +1741,11 @@ static int indic_nextSyllableBoundary(HB
+ if (state == Halant && uc[pos] == 0x200d /* ZWJ */)
+ break;
+ // the control character should be the last char in the item
++ if (state == Consonant && script == HB_Script_Bengali && uc[pos-1] == 0x09B0 && uc[pos] == 0x200d /* ZWJ */)
++ break;
++ if (state == Consonant && script == HB_Script_Kannada && uc[pos-1] == 0x0CB0 && uc[pos] == 0x200d /* ZWJ */)
++ break;
++ // Bengali and Kannada has a special exception for rendering yaphala with ra (to avoid reph) see http://www.unicode.org/faq/indic.html#15
+ ++pos;
+ goto finish;
+ case Consonant:
diff --git a/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch b/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
new file mode 100644
index 0000000..ee76927
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
@@ -0,0 +1,12 @@
+diff -rup qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-30 07:23:12.000000000 +0530
++++ qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-22 14:33:33.000000000 +0530
+@@ -37,7 +37,7 @@ static HB_Bool isLetter(HB_UChar16 ucs)
+ FLAG(HB_Letter_Titlecase) |
+ FLAG(HB_Letter_Modifier) |
+ FLAG(HB_Letter_Other);
+- return FLAG(HB_GetUnicodeCharCategory(ucs)) & test;
++ return (FLAG(HB_GetUnicodeCharCategory(ucs)) & test) != 0;
+ }
+
+ static HB_Bool isMark(HB_UChar16 ucs)
diff --git a/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch b/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
new file mode 100644
index 0000000..507f876
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
@@ -0,0 +1,14 @@
+diff -rup qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-02 07:33:13.000000000 +0530
++++ qt-everywhere-opensource-src-4.6.3_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-10 18:37:23.000000000 +0530
+@@ -1779,10 +1779,6 @@ static int indic_nextSyllableBoundary(HB
+ case Matra:
+ if (state == Consonant || state == Nukta)
+ break;
+- if (state == Matra) {
+- // ### needs proper testing for correct two/three part matras
+- break;
+- }
+ // ### not sure if this is correct. If it is, does it apply only to Bengali or should
+ // it work for all Indic languages?
+ // the combination Independent_A + Vowel Sign AA is allowed.
diff --git a/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch b/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
new file mode 100644
index 0000000..bf49f30
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
@@ -0,0 +1,30 @@
+diff -rup qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-06-30 07:23:12.000000000 +0530
++++ qt-everywhere-opensource-src-4.7.0-beta2_mod/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2010-09-20 11:40:58.000000000 +0530
+@@ -660,18 +660,18 @@ static const unsigned char indicPosition
+ None, None, None, None,
+
+ None, None, None, None,
+- None, None, None, None,
+- None, None, None, None,
+- None, None, None, None,
++ None, Below, Below, Below,
++ Below, Below, Below, Below,
++ Below, Below, None, Below,
+
+- None, None, None, None,
+- Below, None, None, None,
+- Below, None, None, None,
++ Below, Below, Below, Below,
++ Below, Below, Below, Below,
++ Below, None, Below, Below,
+ Below, Below, Below, Post,
+
+ Below, None, Below, Below,
+- None, None, None, None,
+- None, None, None, None,
++ None, Below, Below, Below,
++ Below, Below, None, None,
+ None, None, Post, Above,
+
+ Post, Below, Below, Below,
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
new file mode 100644
index 0000000..e0305e1
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+ options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++ if (cups) {
++ const ppd_option_t* duplex = cups->ppdOption("Duplex");
++ if (duplex) {
++ // copy default ppd duplex to qt dialog
++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++ options.duplexShort->setChecked(true);
++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++ options.duplexLong->setChecked(true);
++ else
++ options.noDuplex->setChecked(true);
++ }
++
++ if (cups->currentPPD()) {
++ // set default color
++ if (cups->currentPPD()->color_device)
++ options.color->setChecked(true);
++ else
++ options.grayscale->setChecked(true);
++ }
++
++ // set collation
++ const ppd_option_t *collate = cups->ppdOption("Collate");
++ if (collate)
++ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++ }
+ }
+ #endif
+
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+ && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+ setOutputFormat(QPrinter::PdfFormat);
+ }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++ // fill in defaults from ppd file
++ QCUPSSupport cups;
++
++ int printernum = -1;
++ for (int i = 0; i < cups.availablePrintersCount(); i++) {
++ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++ printernum = i;
++ }
++ if (printernum >= 0) {
++ cups.setCurrentPrinter(printernum);
++
++ const ppd_option_t* duplex = cups.ppdOption("Duplex");
++ if (duplex) {
++ // copy default ppd duplex to qt dialog
++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++ setDuplex(DuplexShortSide);
++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++ setDuplex(DuplexLongSide);
++ else
++ setDuplex(DuplexNone);
++ }
++
++ if (cups.currentPPD()) {
++ // set default color
++ if (cups.currentPPD()->color_device)
++ setColorMode(Color);
++ else
++ setColorMode(GrayScale);
++ }
++
++ // set collation
++ const ppd_option_t *collate = cups.ppdOption("Collate");
++ if (collate)
++ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++ }
++#endif
+ }
+
+ /*!
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
new file mode 100644
index 0000000..f0c9eaa
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
@@ -0,0 +1,21 @@
+diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
+--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck 2010-06-01 21:03:15.000000000 -0500
++++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-29 14:58:12.299073784 -0500
+@@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS
+ GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
+ return (XEventsQueued(X11->display, QueuedAfterFlush)
+ || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
+- && !source->d->queuedUserInputEvents.isEmpty()));
++ && source->d && !source->d->queuedUserInputEvents.isEmpty()));
+ }
+
+ static gboolean x11EventSourceCheck(GSource *s)
+@@ -84,7 +84,7 @@ static gboolean x11EventSourceCheck(GSou
+ GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
+ return (XEventsQueued(X11->display, QueuedAfterFlush)
+ || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
+- && !source->d->queuedUserInputEvents.isEmpty()));
++ && source->d && !source->d->queuedUserInputEvents.isEmpty()));
+ }
+
+ static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
new file mode 100644
index 0000000..32b9713
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
@@ -0,0 +1,26 @@
+diff -up qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp.CVE-2010-1822-crash-svg-image qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp
+--- qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp.CVE-2010-1822-crash-svg-image 2010-09-10 11:05:20.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.cpp 2010-10-25 14:22:06.542771102 +0200
+@@ -86,6 +86,11 @@ RenderObject* SVGGElement::createRendere
+ return new (arena) RenderSVGTransformableContainer(this);
+ }
+
++bool SVGGElement::rendererIsNeeded(RenderStyle*)
++{
++ return parentNode() && parentNode()->isSVGElement();
++}
++
+ }
+
+ #endif // ENABLE(SVG)
+diff -up qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h.CVE-2010-1822-crash-svg-image qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h
+--- qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h.CVE-2010-1822-crash-svg-image 2010-09-10 11:05:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0/src/3rdparty/webkit/WebCore/svg/SVGGElement.h 2010-10-25 14:28:37.467854695 +0200
+@@ -43,6 +43,7 @@ namespace WebCore {
+ virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void svgAttributeChanged(const QualifiedName&);
+ virtual void synchronizeProperty(const QualifiedName&);
++ virtual bool rendererIsNeeded(RenderStyle*);
+ virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
+
+ virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
new file mode 100644
index 0000000..d517de5
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
@@ -0,0 +1,31 @@
+From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001
+From: Frank Reininghaus <frank78ac(a)googlemail.com>
+Date: Wed, 22 Sep 2010 10:19:59 +0200
+Subject: [PATCH] QTreeView: do not scroll to top if last item is removed
+
+When the last item is the current item and is removed,
+QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
+viewItems member is cleared. This commit makes sure that viewItems is
+restored by calling QTreeView::doItemsLayout() in this case, preventing
+that the scroll bar range is set to zero temporarily and the view is
+scrolled to the top unexpectedly (this was a regression in 4.7.0:
+QTBUG-13567).
+
+Merge-request: 2481
+Reviewed-by: Olivier Goffart <olivier.goffart(a)nokia.com>
+
+diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
+index b797776..40b51fe 100644
+--- a/src/gui/itemviews/qtreeview.cpp
++++ b/src/gui/itemviews/qtreeview.cpp
+@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars()
+ if (!viewportSize.isValid())
+ viewportSize = QSize(0, 0);
+
++ if (viewItems.isEmpty()) {
++ q->doItemsLayout();
++ }
++
+ int itemsInViewport = 0;
+ if (uniformRowHeights) {
+ if (defaultItemHeight <= 0)
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
new file mode 100644
index 0000000..0b99d08
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
@@ -0,0 +1,34 @@
+From 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba Mon Sep 17 00:00:00 2001
+From: Denis Dzyubenko <denis.dzyubenko(a)nokia.com>
+Date: Wed, 29 Sep 2010 14:02:10 +0200
+Subject: [PATCH] Fixes cursor shape when widget becomes native on X11.
+
+When a native window handle is created for a widget that has override
+cursor set, we should reset the cursor on the parent and set the cursor
+on the new window handle.
+
+Task-number: QTBUG-6185
+Reviewed-by: Olivier Goffart
+---
+ src/gui/kernel/qwidget_x11.cpp | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
+index e01489f..8d80e10 100644
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -889,8 +889,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+ q->setWindowOpacity(maybeTopData()->opacity/255.);
+
+ }
+- } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) {
++ } else if (q->internalWinId()) {
+ qt_x11_enforce_cursor(q);
++ if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent
++ qt_x11_enforce_cursor(p);
+ }
+
+ if (extra && !extra->mask.isEmpty() && q->internalWinId())
+--
+1.6.1
+
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
new file mode 100644
index 0000000..016b3b4
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
@@ -0,0 +1,19 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp.pluginpath qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp.pluginpath 2010-05-03 19:43:20.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp 2010-06-18 10:02:37.004788646 -0500
+@@ -345,6 +345,7 @@ Vector<String> PluginDatabase::defaultPl
+ paths.append("/usr/lib/firefox/plugins");
+ paths.append("/usr/lib64/browser-plugins");
+ paths.append("/usr/lib/browser-plugins");
++ paths.append("/usr/lib/mozilla/plugins-wrapped");
+ paths.append("/usr/lib/mozilla/plugins");
+ paths.append("/usr/local/netscape/plugins");
+ paths.append("/opt/mozilla/plugins");
+@@ -355,6 +356,7 @@ Vector<String> PluginDatabase::defaultPl
+ paths.append("/usr/lib/netscape/plugins-libc5");
+ paths.append("/usr/lib/netscape/plugins-libc6");
+ paths.append("/usr/lib64/netscape/plugins");
++ paths.append("/usr/lib64/mozilla/plugins-wrapped");
+ paths.append("/usr/lib64/mozilla/plugins");
+ paths.append("/usr/lib/nsbrowser/plugins");
+ paths.append("/usr/lib64/nsbrowser/plugins");
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
new file mode 100644
index 0000000..1eedf83
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
@@ -0,0 +1,61 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390x qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390x 2010-06-16 13:54:50.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-06-16 13:53:43.000000000 +0200
+@@ -179,6 +179,18 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if defined(__i386__) \
+ || defined(i386) \
+@@ -860,7 +872,7 @@
+ #endif
+
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.s390x qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.s390x 2010-06-16 13:49:00.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h 2010-06-16 13:50:01.000000000 +0200
+@@ -169,6 +169,18 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if defined(__i386__) \
+ || defined(i386) \
+@@ -874,6 +886,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+ || (CPU(IA64) && !CPU(IA64_32)) \
+ || CPU(ALPHA) \
++ || CPU(S390X) \
+ || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS)
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
new file mode 100644
index 0000000..09670c1
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
@@ -0,0 +1,36 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp 2010-06-25 14:11:21.815474310 -0500
+@@ -152,7 +152,7 @@ void Ui3Reader::embed(const char *projec
+ for ( it = images.begin(); it != images.end(); ++it )
+ out << "** " << *it << "\n";
+ out << "**\n";
+- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
++ out << "** Created: " << "\n";
+ out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n";
+ out << "**\n";
+ out << "** WARNING! All changes made in this file will be lost!\n";
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp 2010-06-25 14:11:32.910460623 -0500
+@@ -146,7 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
+ out << "/********************************************************************************\n";
+ out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
+ out << "**\n";
+- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
++ out << "** Created: " << "\n";
+ out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
+ out << "**\n";
+ out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp 2010-06-25 14:10:45.360711498 -0500
+@@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
+ out << "/********************************************************************************\n";
+ out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
+ out << "**\n";
+- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
++ out << "** Created: " << "\n";
+ out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
+ out << "**\n";
+ out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
new file mode 100644
index 0000000..822ace8
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
@@ -0,0 +1,19 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2010-06-29 20:53:15.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp 2010-07-08 08:24:12.714604479 -0500
+@@ -2262,6 +2262,15 @@ QStringList QCoreApplication::libraryPat
+ if (!app_libpaths->contains(installPathPlugins))
+ app_libpaths->append(installPathPlugins);
+ }
++
++ // hack in support for kde4 plugin paths -- Rex
++ QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
++ if (QFile::exists(kde4PathPlugins)) {
++ // Make sure we convert from backslashes to slashes.
++ // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
++ if (!app_libpaths->contains(kde4PathPlugins))
++ app_libpaths->append(kde4PathPlugins);
++ }
+ #endif
+
+ // If QCoreApplication is not yet instantiated,
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
new file mode 100644
index 0000000..47c066b
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
@@ -0,0 +1,19 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure
+--- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config 2010-06-29 20:53:10.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta2/configure 2010-07-08 08:30:32.148864934 -0500
+@@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+ [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
+ if [ -x "$CFG_MYSQL_CONFIG" ]; then
+ QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
++ $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
++ QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
++ if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
++ QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
++ QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
++ else
+ QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
+ QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
++ fi
+ QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
+ QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
+ fi
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
new file mode 100644
index 0000000..e5ef6a0
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
@@ -0,0 +1,40 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
+--- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile 2010-06-29 20:53:12.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2010-07-08 08:25:50.419855085 -0500
+@@ -2,7 +2,7 @@
+ Type=Service
+ X-KDE-ServiceTypes=PhononBackend
+ MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
+-X-KDE-Library=phonon_gstreamer
++X-KDE-Library=libphonon_gstreamer
+ X-KDE-PhononBackendInfo-InterfaceVersion=1
+ X-KDE-PhononBackendInfo-Version=0.1
+ X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/
+diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro
+--- qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile 2010-06-29 20:53:13.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro 2010-07-08 08:26:58.307612257 -0500
+@@ -122,6 +122,11 @@ contains(QT_CONFIG, dbus) {
+ DEFINES += QT_NO_DBUS
+ }
+
++# install dbus service file
++sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
++sources.path = /usr/share/dbus-1/interfaces
++INSTALLS += sources
++
+ contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
+
+ unix:!isEmpty(QT_CFLAGS_PULSEAUDIO) {
+diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro
+--- qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile 2010-06-29 20:53:14.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro 2010-07-08 08:25:50.387854526 -0500
+@@ -64,6 +64,8 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstra
+ }
+
+ target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
+-INSTALLS += target
++services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
++services.path = /usr/share/kde4/services/phononbackends
++INSTALLS += target services
+
+ include(../../qpluginbase.pri)
diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
new file mode 100644
index 0000000..910e15f
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
@@ -0,0 +1,15 @@
+diff -up qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp.me qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp
+--- qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp.me 2010-10-15 22:04:09.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0/src/gui/image/qpixmap_x11.cpp 2010-10-15 22:04:18.000000000 +0200
+@@ -900,9 +900,9 @@ void QX11PixmapData::fromImage(const QIm
+ case BPP24_888: // 24 bit MSB
+ CYCLE(
+ for (int x=0; x<w; x++) {
+- *dst++ = qRed (*p);
++ *dst++ = qBlue (*p);
+ *dst++ = qGreen(*p);
+- *dst++ = qBlue (*p++);
++ *dst++ = qRed (*p++);
+ }
+ )
+ break;
diff --git a/pkgs/core/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch b/pkgs/core/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
new file mode 100644
index 0000000..099a8a2
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
@@ -0,0 +1,33 @@
+--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600
++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf 2007-02-26 15:01:02.000000000 -0600
+@@ -14,6 +14,8 @@
+ QMAKE_CFLAGS = -m64
+ QMAKE_LFLAGS = -m64
+
++QMAKE_CFLAGS_RELEASE += -O2
++
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+
+--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600
++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf 2007-02-26 15:01:34.000000000 -0600
+@@ -11,6 +11,8 @@
+ QMAKE_CFLAGS = -m32
+ QMAKE_LFLAGS = -m32
+
++QMAKE_CFLAGS_RELEASE += -O2
++
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ load(qt_config)
+--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600
++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf 2007-02-26 15:01:26.000000000 -0600
+@@ -8,6 +8,8 @@
+ QT += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+
++QMAKE_CFLAGS_RELEASE += -O2
++
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ load(qt_config)
diff --git a/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch b/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
new file mode 100644
index 0000000..e5ab4ba
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
@@ -0,0 +1,50 @@
+diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h
+--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h 2009-02-25 22:09:21.000000000 +0100
++++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h 2009-04-01 17:54:21.000000000 +0200
+@@ -115,8 +115,8 @@
+ asm volatile("lock\n"
+ "incl %0\n"
+ "setne %1"
+- : "=m" (_q_value), "=qm" (ret)
+- : "m" (_q_value)
++ : "+m" (_q_value), "=qm" (ret)
++ :
+ : "memory");
+ return ret != 0;
+ }
+@@ -127,8 +127,8 @@
+ asm volatile("lock\n"
+ "decl %0\n"
+ "setne %1"
+- : "=m" (_q_value), "=qm" (ret)
+- : "m" (_q_value)
++ : "+m" (_q_value), "=qm" (ret)
++ :
+ : "memory");
+ return ret != 0;
+ }
+diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h
+--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h 2009-02-25 22:09:21.000000000 +0100
++++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h 2009-04-01 17:54:32.000000000 +0200
+@@ -116,8 +116,8 @@
+ asm volatile("lock\n"
+ "incl %0\n"
+ "setne %1"
+- : "=m" (_q_value), "=qm" (ret)
+- : "m" (_q_value)
++ : "+m" (_q_value), "=qm" (ret)
++ :
+ : "memory");
+ return ret != 0;
+ }
+@@ -128,8 +128,8 @@
+ asm volatile("lock\n"
+ "decl %0\n"
+ "setne %1"
+- : "=m" (_q_value), "=qm" (ret)
+- : "m" (_q_value)
++ : "+m" (_q_value), "=qm" (ret)
++ :
+ : "memory");
+ return ret != 0;
+ }
diff --git a/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
new file mode 100644
index 0000000..4ab3ea4
--- /dev/null
+++ b/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
@@ -0,0 +1,12 @@
+diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
+--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter 2009-04-21 18:57:41.000000000 -0500
++++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp 2009-04-24 11:17:49.562695405 -0500
+@@ -72,7 +72,7 @@
+ #include FT_CONFIG_OPTIONS_H
+ #endif
+
+-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
++#if defined(FT_LCD_FILTER_H)
+ #define QT_USE_FREETYPE_LCDFILTER
+ #endif
+
diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm
index 1629bdc..287121c 100644
--- a/pkgs/core/qt/qt.nm
+++ b/pkgs/core/qt/qt.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = qt
PKG_VER = 4.7.0
-PKG_REL = 1
+PKG_REL = 3
PKG_MAINTAINER =
PKG_GROUP = System/Libraries
@@ -125,11 +125,4 @@ endef
define STAGE_INSTALL
cd $(DIR_APP) && make install INSTALL_ROOT=$(BUILDROOT)
-
- # Remove libs for Qt designer
- rm -rvf $(BUILDROOT)/usr/lib/libQtDesigner*
-
- # Remove translations for Qt assistant and designer
- rm -rvf $(BUILDROOT)/usr/share/qt4/translations/assistant*
- rm -rvf $(BUILDROOT)/usr/share/qt4/translations/designer*
endef
diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm
index 3b3ac15..489905e 100644
--- a/pkgs/core/sip/sip.nm
+++ b/pkgs/core/sip/sip.nm
@@ -25,8 +25,8 @@
include $(PKGROOT)/Include
PKG_NAME = sip
-PKG_VER = 4.11.2
-PKG_REL = 1
+PKG_VER = 4.12-snapshot-12acbffd0085
+PKG_REL = 0
PKG_EPOCH = 1
PKG_MAINTAINER =
hooks/post-receive
--
IPFire 3.x development tree
1
0