prepare release

Makefile

@@ -1,4 +1,4 @@
-V=0.9.24
+V=0.9.26
 
 PREFIX = /usr/local
 

archrelease

@@ -36,11 +36,11 @@ if [ -d "repos/${1}" ]; then
 fi
 if [ ! -d repos ]; then
 	mkdir repos
-	svn add repos
+	svn add -q repos
 fi
 if [ ! -d "repos/${1}" ]; then
 	mkdir "repos/${1}"
-	svn add "repos/${1}"
+	svn add -q "repos/${1}"
 fi
 known_files=$(svn ls "trunk")
 for file in $known_files; do

commitpkg

@@ -108,13 +108,14 @@ if [ "$1" = "-a" ]; then
 	shift 2
 fi
 
-echo -n 'committing changes to trunk...'
-msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel)
+if [ -n "$(svn status -q)" ]; then
+	echo -n 'committing changes to trunk...'
+	msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel)
 
-"
-if [ -n "$1" ]; then
+	"
+	if [ -n "$1" ]; then
 		svn commit -q -m "${msgtemplate}${1}" || abort
-else
+	else
 		msgfile="$(mktemp)"
 		echo "$msgtemplate" > "$msgfile"
 		if [ -n "$SVN_EDITOR" ]; then
@@ -129,8 +130,9 @@ else
 		[ -s "$msgfile" ] || abort
 		svn commit -q -F "$msgfile" || abort
 		unlink "$msgfile"
+	fi
+	echo 'done'
 fi
-echo 'done'
 
 declare -a uploads
 

makepkg-i686.conf

@@ -29,9 +29,9 @@ CHOST="i686-pc-linux-gnu"
 #-- Exclusive: will only run on i686
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 

makepkg-x86_64.conf

@@ -29,9 +29,9 @@ CHOST="x86_64-unknown-linux-gnu"
 #-- Exclusive: will only run on x86_64
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"