xmount: v0.7.3 bump

2025-12-06 08:25:01 +01:00 · 2015-11-29 14:20:13 +08:00 · 2015-11-29 14:20:13 +08:00 · 2257c9dc12
commit 2257c9dc12
parent e022b07852
6 changed files with 59 additions and 42 deletions
--- a/app-forensics/xmount/Manifest
+++ b/app-forensics/xmount/Manifest
@ -1,2 +1,2 @@
-DIST xmount-0.5.0.tar.gz 157673 SHA256 ae051d1901a74b34dce737275d0d385b20c21557d1458818dae8d04d5b25a47e SHA512 87645549249c33d091e7f1149b5d1b8d4227df763aa1682b4c2405b8701b6280df161547cdfd07749c1f3e19a7367c62e383ba05fe88b9ec94a10c739c9ff4f3 WHIRLPOOL 537db72389887ea07e0fd86c73c5cf8bd0261cc681cf9d8ecb1141491dd86384d63c53638558d6ad4a28202a84bfd55a237624209052704a19d5140bbe5ef5a3
-DIST xmount-0.6.0.tar.gz 170365 SHA256 a9f2febe3f4198d4d679bfb091b0537d40ed11493a5f2cd59e9ae9904ea22960 SHA512 c74aa45d189525719a6755d306a0b3daba2263d8038ce53504e1cdd916f0910634bbc97b78cbaa1e21a6456a0a66b4163ec30e2d75375186078ce692896bdba8 WHIRLPOOL d153987ff4de2806aac64482299e08553d26d446f4f8998c45003d3a92ba6cfb1676b27239ef27a0aacd28313b5d55dd39783a377cf90c4774b3e6391247f062
+DIST xmount-0.5.0.tar.gz 157318 SHA256 a67d9856645d8d83ab5b806a350c646497cd70a107e20a8a016fc2f1f85952f7 SHA512 007eac3d07443ac779cdd5e0a4bbf54c31d1af52a2697671262b035a33fb1ba3c7f33c7a73bc80400d87de808706e93ebab3a02accfc9e3935d341ca2d3e3856 WHIRLPOOL 71e51a0e18007d99bfbe7ef2e66b1fcaf24a5469ab46b49ceee017562c5eea4e95202fb62f28ac3e75d938fda0bb45bc64281c5a6280d11c132f97a77418f10e
+DIST xmount-0.7.3.tar.gz 109850 SHA256 9702b99b6ca72e74726cc08cd0a3cbf98f66d204f6ba4113c0d4468111764ded SHA512 d75e8775a7cfa7172b1bd04a0742fea9f5792b9e76f507df6b444cd094ae7f9b8c0ebe8a03356eb6956ce851a24edff73e3f73afe0ef1433b7f4a9e488fcf586 WHIRLPOOL bba40d7cf790b9df5f03324a8ba6607e5029feb923df5e0b975f53c99546ba88fbfbb005e3f0f9e0c9b31bd5c1195e3755af9731da79ef78589ee7dc5b19f4c6
--- a/app-forensics/xmount/files/cmake_c_flags
+++ b/app-forensics/xmount/files/cmake_c_flags
@ -0,0 +1,20 @@
+Description: support providing custom CMAKE_C_FLAGS
+ This patch allows overwriting CMAKE_C_FLAGS, which is required
+ so we can pass e.g. hardening flags via the Debian package build system.
+
+Author: Michael Prokop <mika@debian.org>
+Forwarded: no
+Last-Update: 2015-07-03
+
+--- xmount-0.7.3.orig/CMakeLists.txt
+++ xmount-0.7.3/CMakeLists.txt
+@@ -73,7 +73,9 @@ include_directories(${CMAKE_CURRENT_BINA
+ add_definitions(-D_LARGEFILE64_SOURCE)
+ add_definitions(-D_FILE_OFFSET_BITS=64)
+ add_definitions(-D_GNU_SOURCE)
+if(NOT CMAKE_C_FLAGS)
+ set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall")
+endif(CMAKE_C_FLAGS)
+ set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}")
+ set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}")
+ 
--- a/app-forensics/xmount/xmount-0.5.0.ebuild
+++ b/app-forensics/xmount/xmount-0.5.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv $
+# $Id$

 EAPI=5

@ -8,8 +8,8 @@ inherit eutils autotools

 DESCRIPTION="Convert on-the-fly between multiple input and output harddisk image types"
 HOMEPAGE="https://www.pinguin.lu/xmount"
-SRC_URI="http://files.pinguin.lu/${P}.tar.gz"
-
+#SRC_URI="http://files.pinguin.lu/${P}.tar.gz"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/xmount_${PV}.orig.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+aff +ewf"
@ -19,11 +19,11 @@ RDEPEND="sys-fs/fuse
 	aff? ( app-forensics/afflib )
 	ewf? ( app-forensics/libewf )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"

 src_prepare(){
-	epatch ${FILESDIR}/configure.ac.diff
-	epatch ${FILESDIR}/configure.diff
+	epatch "${FILESDIR}"/configure.ac.diff
+	epatch "${FILESDIR}"/configure.diff
 	eautomake
 }

--- a/app-forensics/xmount/xmount-0.6.0.ebuild
+++ b/app-forensics/xmount/xmount-0.6.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv $
-
-EAPI=5
-
-DESCRIPTION="Convert on-the-fly between multiple input and output harddisk image types"
-HOMEPAGE="https://www.pinguin.lu/xmount"
-SRC_URI="http://files.pinguin.lu/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+aff +ewf"
-
-#unable to build, see the upstream bug: https://www.pinguin.lu/node/16
-KEYWORDS=""
-
-RDEPEND="sys-fs/fuse
-	aff? ( app-forensics/afflib )
-	ewf? ( app-forensics/libewf )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare(){
-	sed -e "s#LIBS = \@LIBS\@#LIBS = \@LIBS\@ -lz#" \
-		-i Makefile.in
-}
-
-src_configure() {
-	use aff || export ac_cv_lib_afflib_af_open=no
-	use ewf || export ac_cv_lib_ewf_libewf_open=no
-	econf
-}
--- a/app-forensics/xmount/xmount-0.7.3.ebuild
+++ b/app-forensics/xmount/xmount-0.7.3.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils
+
+DESCRIPTION="Convert on-the-fly between multiple input and output harddisk image types"
+HOMEPAGE="https://www.pinguin.lu/xmount"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/xmount_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+aff +ewf"
+KEYWORDS="~amd64 ~x86 ~arm"
+
+RDEPEND="sys-fs/fuse
+	aff? ( app-forensics/afflib )
+	ewf? ( app-forensics/libewf )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+#prepare: we might need files/cmake_c_flags patch on hardened
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release
+	cmake-utils_src_configure
+}
--- a/profiles/pentoo/base/package.accept_keywords/app-forensics
+++ b/profiles/pentoo/base/package.accept_keywords/app-forensics
@ -15,3 +15,5 @@ app-forensics/libbfio
 app-forensics/libvshadow

 ~app-forensics/guymager-0.7.3
+
+~app-forensics/xmount-0.7.3