Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=c0526fbbf91f83d21e84e3686299593695470af6
commit c0526fbbf91f83d21e84e3686299593695470af6 Author: crazy <cr...@frugalware.org> Date: Sun Feb 4 21:05:54 2018 +0100 pacman-g2-3.9.4-2-x86_64 * added patch from git for plt and noprotector fixes * remove $USE_DEVEL diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 682558c..b3cdd4d 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -3,13 +3,11 @@ # Contributor: Miklos Vajna <vmik...@frugalware.org> USE_DEBUG=${USE_DEBUG:-"n"} -USE_DEVEL=${USE_DEVEL:-"n"} USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 pkgver=3.9.4 -Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=1 +pkgrel=2 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/frugalware-current) @@ -18,24 +16,17 @@ rodepends=('shadow') ## wrong but since pacman installs itself first ... ## not sure why it needs nettle ?:( nettle is in chroot-core so something else need it if ! Fuse $USE_MINIMAL; then ## temporarily disable some makedepends - makedepends=('doxygen>=1.7.3-1' 'po4a' 'swig' \ - 'asciidoc' 'docbook-xsl' \ - 'docbook-xml' 'sgml-common' 'lzo>=2.09-6' 'lz4>=r131-8' 'vala' 'gcc>=7.3.0-4') + makedepends+=('doxygen>=1.7.3-1' 'po4a' 'swig' \ + 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common' \ + 'lzo>=2.09-6' 'lz4>=r131-8' 'vala' 'gcc>=7.3.0-4') options+=('scriptlet') fi -Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') groups=('base' 'chroot-core') archs=('x86_64') _F_archive_nosort=y up2date="Flasttar $url/releases/" -if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz) - signatures=("$source.asc") -else - _F_scm_type="git" - _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" - Finclude scm -fi +source=($url/releases/$pkgname-$pkgver.tar.gz git.patch) +signatures=("$source.asc" '') if ! Fuse $USE_DEBUG; then Fconfopts+=" --disable-debug" @@ -51,12 +42,6 @@ options+=('static') build() { - if Fuse $USE_DEVEL; then - (cd ~; mkdir -p git; cd git; git clone git://git.frugalware.org/pub/other/translations) - Funpack_scm - Fsed '\(^AC_INIT(.*, \)[0-9\.]\+\(, .*\)' "\1$pkgver\2/" configure.ac - sh autogen.sh - fi if Fuse $USE_MINIMAL; then Fbuild diff --git a/source/base/pacman-g2/git.patch b/source/base/pacman-g2/git.patch new file mode 100644 index 0000000..4f49edf --- /dev/null +++ b/source/base/pacman-g2/git.patch @@ -0,0 +1,90 @@ +diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in +index 24e0a14a..289f5f00 100644 +--- a/etc/makepkg.conf.in ++++ b/etc/makepkg.conf.in +@@ -14,13 +14,14 @@ case $(uname -m) in + x86_64) + CARCH="x86_64" + CHOST="x86_64-frugalware-linux" +- CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +- CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" ++ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" ++ CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" + ;; + esac + +-## options+=('noprotector') allows to manipulate -fstack-protector-strong +-## from FrugalBuild. Eg, to use ..=${CFLAGS/-fstack-protector-strong/} ++## FLAGS added from makepkg: ++## -fno-plt : can be disbled with options+=('plt') ++## -fstack-protector-strong : can be disabled with options+=('noprotector') + export CARCH CHOST CFLAGS CXXFLAGS + + ## -Wl,--as-needed is set from makepkg. Disable with options+=('noasneeded') +diff --git a/scripts/makepkg b/scripts/makepkg +index d6cde41f..47c473d7 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -1240,7 +1240,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then + msg "Your package has coding issues" + warning "Broken strict-aliasing rules detected" + warning "C/CXX FLAGS need -fno-strict-aliasing" +- warning "Please recompile with right CFLAGS" ++ warning "Please recompile with right C/CXX FLAGS" + fi + # copy build log to LOGDIR if set + if [ -d "$LOGDIR" ]; then +@@ -1428,10 +1428,7 @@ if [ "$INCHROOT" == "1" ]; then + fi + + if ! $ECHO $CFLAGS | grep -q "\-fstack-protector-strong" ; then +- if [ "`check_option NOPROTECTOR`" ]; then +- warning "You disabled stack-protector.. Do that *ONLY*" +- warning "when you have a very GOOD reason.." +- else ++ if [ ! "`check_option NOPROTECTOR`" ]; then + error "Your build/makepkg.conf is broken" + error "CFLAGS is missing -fstack-protector-strong" + error "and options+=('noprotector') is not set.." +@@ -1440,12 +1437,9 @@ if [ "$INCHROOT" == "1" ]; then + fi + + if ! $ECHO $CXXFLAGS | grep -q "\-fstack-protector-strong" ; then +- if [ "`check_option NOPROTECTOR`" ]; then +- warning "You disabled stack-protector.. Do that *ONLY*" +- warning "when you have a very GOOD reason.." +- else ++ if [ ! "`check_option NOPROTECTOR`" ]; then + error "Your build/makepkg.conf is broken" +- error "CXXFLAGS is missing -fstack-protector-strong missing" ++ error "CXXFLAGS is missing -fstack-protector-strong" + error "and options+=('noprotector') is not set.." + exit 1 + fi +@@ -1500,6 +1494,26 @@ if [ "$INCHROOT" == "1" ]; then + export CFLAGS CXXFLAGS + fi + ++ ## add before PLT ++ if [ "`check_option NOPROTECTOR`" ]; then ++ warning "Disabling -fstack-protector-strong in C/CXX FLAGS." ++ warning "Do that only with an GOOD reason.." ++ else ++ msg "Enabling -fstack-protector-strong in C/CXX FLAGS" ++ CFLAGS+=" -fstack-protector-strong" ++ CXXFLAGS+=" -fstack-protector-strong" ++ export CFLAGS CXXFLAGS ++ fi ++ ++ if [ "`check_option PLT`" ]; then ++ warning "Disabling -fno-plt C/CXX FLAGS" ++ else ++ msg "Enabling -fno-plt in C/CXX FLAGS" ++ CFLAGS+=" -fno-plt" ++ CXXFLAGS+=" -fno-plt" ++ export CFLAGS CXXFLAGS ++ fi ++ + if [ "`check_option NORELRO`" ]; then + warning "Disabling LDFLAGS: -z,relro" + export ORELRO=0 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git