[SCM] Packaging of KVIrc branch, master, updated. debian/4.1.3+20110929.svn5980-1-8-g099cb64

Raúl Sánchez Siles kebianizao-guest at alioth.debian.org
Fri Apr 20 22:11:42 UTC 2012 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=commitdiff;h=099cb64

The following commit has been merged in the master branch:
commit 099cb6406d32ccd341a8e0ea7c21714d4d4f90ab
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sat Apr 21 00:07:11 2012 +0200

    Fix "Hardening flags missing". Applying suggested changes. (Closes: #669189) Thanks to Simon Ruderich.
---
 debian/changelog                           |    4 +++-
 debian/patches/00_hardening_upstream.patch |   18 ++++++++++++++++++
 debian/patches/30_upstream_build-g         |   15 +++++++--------
 debian/patches/series                      |    1 +
 debian/rules                               |    5 ++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8201aa..6ee1a3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ kvirc (4:4.1.3+20111124.svn5988-2) UNRELEASED; urgency=low
   * Fix "must not be "Multi-Arch: same"" kvirc is Multi-Arch: foreign
     (Closes: #658058)
   * Actually provide valid -dbg package. Added 30_upstream_build-g
+  * Fix "Hardening flags missing". Applying suggested changes.
+    (Closes: #669189) Thanks to Simon Ruderich.
 
- -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Thu, 15 Mar 2012 21:37:37 +0100
+ -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Fri, 20 Apr 2012 23:57:48 +0200
 
 kvirc (4:4.1.3+20111124.svn5988-1) unstable; urgency=low
 
diff --git a/debian/patches/00_hardening_upstream.patch b/debian/patches/00_hardening_upstream.patch
new file mode 100644
index 0000000..57f2114
--- /dev/null
+++ b/debian/patches/00_hardening_upstream.patch
@@ -0,0 +1,18 @@
+Description: Use build flags from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-04-17
+
+--- kvirc-4.1.3+20111124.svn5988.orig/CMakeLists.txt
++++ kvirc-4.1.3+20111124.svn5988/CMakeLists.txt
+@@ -220,8 +220,8 @@ ELSE()
+ 		ENDIF()
+ 		IF(CMAKE_COMPILER_IS_GNUCXX)
+ 			#force gdb options
+-			SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-			SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
++			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
++			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+ 			INCLUDE(CheckCXXCompilerFlag)
+ 			CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
+ 			#gcc doesn't support visibility on PE/win32
diff --git a/debian/patches/30_upstream_build-g b/debian/patches/30_upstream_build-g
index 878d6a4..88f6ba6 100644
--- a/debian/patches/30_upstream_build-g
+++ b/debian/patches/30_upstream_build-g
@@ -9,17 +9,16 @@ Last-Update: 2012-03-15
 Origin: vendor, http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=blob_plain;f=debian/patches/30_upstream_build-g;hb=HEAD
 Forwarded: no
 ---
-diff -r b080175fa625 -r 82f57c4bd88b CMakeLists.txt
---- a/CMakeLists.txt	Wed Feb 29 05:33:52 2012 +0000
-+++ b/CMakeLists.txt	Thu Mar 15 18:48:31 2012 +0100
-@@ -221,8 +221,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,8 +220,8 @@
  		ENDIF()
  		IF(CMAKE_COMPILER_IS_GNUCXX)
  			#force gdb options
--			SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
--			SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
-+			SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
-+			SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
+-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
++			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
++			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
  			INCLUDE(CheckCXXCompilerFlag)
  			CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
  			#gcc doesn't support visibility on PE/win32
diff --git a/debian/patches/series b/debian/patches/series
index 0d8a682..7b4cb9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+00_hardening_upstream.patch
 05_xpmicon.patch
 10_fix_desktop_entry.patch
 21_make_shared-mime-info_B-D_superfluous.patch
diff --git a/debian/rules b/debian/rules
index 84761c5..39203f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 #
 DH_ALWAYS_EXCLUDE:=CVS:.svn:.svnignore:.hg:.hgignore
 
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined -Wl,--as-needed
+
 DEBVERSION = $(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*//')
 UPVERSION = $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
 REV = $(shell echo $(UPVERSION) | sed -e 's/^.*svn//' -e 's/\+rc[0-9]$$//')
@@ -21,9 +23,6 @@ override_dh_auto_configure:
 	dh_auto_configure --parallel -Skde -- -DWANT_COEXISTENCE=OFF \
 			-DWANT_ESD=OFF -DWANT_OSS=OFF \
 			-DWANT_STRIP=OFF \
-			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 			-DMANUAL_REVISION=$(REV) \
 			-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 

-- 
Packaging of KVIrc

More information about the pkg-kde-commits mailing list