From 7bfe80ad2b6035756a019ce332e9868ea8186ba7 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 17 May 2017 22:17:48 +0200 Subject: [PATCH] add centos4 stdlib to work around segfault --- build_orig.sh | 3 +++ debian/arcconf.wrapper | 4 ++++ debian/postinst | 18 +++++++++--------- debian/rules | 10 ++++++++++ files.diz | 34 ++++++++++++++++++---------------- 5 files changed, 44 insertions(+), 25 deletions(-) create mode 100644 debian/arcconf.wrapper diff --git a/build_orig.sh b/build_orig.sh index 6457720..584ff17 100644 --- a/build_orig.sh +++ b/build_orig.sh @@ -42,18 +42,21 @@ do mkdir -p $WORK_DIR/${type}/${realver} pushd $WORK_DIR/${type}/${realver} unzip $DIR/../$outputfile + rpm2cpio $DIR/../$outputfile | cpio -idmv popd mkdir -p $WORK_DIR/${app}-${version}/${type}/${realver} pushd $WORK_DIR/${app}-${version}/${type}/${realver} case "${type}" in "amd64" ) mv $WORK_DIR/${type}/${realver}/linux_x64/cmdline/arcconf . + mv $WORK_DIR/${type}/${realver}/usr/lib64/lib* . chmod +x arcconf dos2unix $WORK_DIR/${type}/${realver}/linux_x64/cmdline/*.{txt,TXT} mv $WORK_DIR/${type}/${realver}/linux_x64/cmdline/*.{txt,TXT} . ;; "i386" ) mv $WORK_DIR/${type}/${realver}/linux/cmdline/arcconf . + mv $WORK_DIR/${type}/${realver}/usr/lib/lib* . chmod +x arcconf dos2unix $WORK_DIR/${type}/${realver}/linux/cmdline/*.{txt,TXT} mv $WORK_DIR/${type}/${realver}/linux/cmdline/*.{txt,TXT} . diff --git a/debian/arcconf.wrapper b/debian/arcconf.wrapper new file mode 100644 index 0000000..03a4db5 --- /dev/null +++ b/debian/arcconf.wrapper @@ -0,0 +1,4 @@ +#!/bin/sh +LD_LIBRARY_PATH=/usr/lib/arcconf:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH +exec /usr/lib/arcconf/arcconf $@ \ No newline at end of file diff --git a/debian/postinst b/debian/postinst index e87f0ef..d507d16 100644 --- a/debian/postinst +++ b/debian/postinst @@ -3,31 +3,31 @@ set -e if [ -f "/usr/lib/arcconf/arcconf-2.03" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-2.03 203 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-2.03 203 fi if [ -f "/usr/lib/arcconf/arcconf-2.02" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-2.02 202 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-2.02 202 fi if [ -f "/usr/lib/arcconf/arcconf-2.01" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-2.01 201 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-2.01 201 fi if [ -f "/usr/lib/arcconf/arcconf-2.00" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-2.00 200 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-2.00 200 fi if [ -f "/usr/lib/arcconf/arcconf-1.08" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-1.08 108 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-1.08 108 fi if [ -f "/usr/lib/arcconf/arcconf-1.07" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-1.07 107 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-1.07 107 fi if [ -f "/usr/lib/arcconf/arcconf-1.06" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-1.06 106 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-1.06 106 fi if [ -f "/usr/lib/arcconf/arcconf-1.05" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-1.05 105 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-1.05 105 fi if [ -f "/usr/lib/arcconf/arcconf-1.04" ]; then - update-alternatives --install /usr/sbin/arcconf arcconf /usr/lib/arcconf/arcconf-1.04 104 + update-alternatives --install /usr/lib/arcconf/arcconf arcconf /usr/lib/arcconf/arcconf-1.04 104 fi #DEBHELPER# diff --git a/debian/rules b/debian/rules index 3015564..bcd3f22 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,11 @@ install: dh_clean -k dh_installdirs ifeq ($(DEB_BUILD_ARCH),amd64) + install -D -m 0755 debian/arcconf.wrapper \ + debian/arcconf/usr/sbin/arcconf + install -D -m 0755 amd64/centos4/libstdc++.so.6.0.3 \ + debian/arcconf/usr/lib/arcconf/libstdc++.so.6.0.3 + ln -s libstdc++.so.6.0.3 debian/arcconf/usr/lib/arcconf/libstdc++.so.6 install -D -m 0755 amd64/2.03/arcconf \ debian/arcconf/usr/lib/arcconf/arcconf-2.03 install -D -m 0755 amd64/2.02/arcconf \ @@ -34,6 +39,11 @@ ifeq ($(DEB_BUILD_ARCH),amd64) debian/arcconf/usr/lib/arcconf/arcconf-1.04 endif ifeq ($(DEB_BUILD_ARCH),i386) + install -D -m 0755 debian/arcconf.wrapper \ + debian/arcconf/usr/sbin/arcconf + install -D -m 0755 i386/centos4/libstdc++.so.6.0.3 \ + debian/arcconf/usr/lib/arcconf/libstdc++.so.6.0.3 + ln -s libstdc++.so.6.0.3 debian/arcconf/usr/lib/arcconf/libstdc++.so.6 install -D -m 0755 i386/2.01/arcconf \ debian/arcconf/usr/lib/arcconf/arcconf-2.01 install -D -m 0755 i386/2.00/arcconf \ diff --git a/files.diz b/files.diz index 0f2965f..43cce6b 100644 --- a/files.diz +++ b/files.diz @@ -1,16 +1,18 @@ -amd64!arcconf!2.03.0!arcconf_v2_03_22476.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_03_22476.zip!e98c9f2fb11d368adc0378ddd9daad40!2.03 -amd64!arcconf!2.03.0!arcconf_v2_02_22404.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_02_22404.zip!373126b8d256aa76022906145a87d398!2.02 -amd64!arcconf!2.03.0!arcconf_v2_01_22270.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip!a51110590c3439245e5179a9e35bad86!2.01 -i386!arcconf!2.03.0!arcconf_v2_01_22270.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip!a51110590c3439245e5179a9e35bad86!2.01 -amd64!arcconf!2.03.0!arcconf_v2_00_21811.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_00_21811.zip!946ed3423254d893120ceb89f7779685!2.00 -i386!arcconf!2.03.0!arcconf_v2_00_21811.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_00_21811.zip!946ed3423254d893120ceb89f7779685!2.00 -amd64!arcconf!2.03.0!arcconf_v1_8_21375.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_8_21375.zip!7a697a7c8b99b66312116d4249ab1922!1.08 -i386!arcconf!2.03.0!arcconf_v1_8_21375.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_8_21375.zip!7a697a7c8b99b66312116d4249ab1922!1.08 -amd64!arcconf!2.03.0!arcconf_v1_7_21229.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_7_21229.zip!8d8e1829172bb72f69081b2ac6d2e50b!1.07 -i386!arcconf!2.03.0!arcconf_v1_7_21229.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_7_21229.zip!8d8e1829172bb72f69081b2ac6d2e50b!1.07 -amd64!arcconf!2.03.0!arcconf_v1_6_21062.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_6_21062.zip!32aa39da4ecca41c4cb987791f5aa656!1.06 -i386!arcconf!2.03.0!arcconf_v1_6_21062.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_6_21062.zip!32aa39da4ecca41c4cb987791f5aa656!1.06 -amd64!arcconf!2.03.0!arcconf_v1_5_20942.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_5_20942.zip!de7e676bdd9c04db8125d04086d9efd6!1.05 -i386!arcconf!2.03.0!arcconf_v1_5_20942.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_5_20942.zip!de7e676bdd9c04db8125d04086d9efd6!1.05 -amd64!arcconf!2.03.0!arcconf_v1_4_20859.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_4_20859.zip!6c3d72fe83ff76e68a70fa59d92ae5f7!1.04 -i386!arcconf!2.03.0!arcconf_v1_4_20859.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_4_20859.zip!6c3d72fe83ff76e68a70fa59d92ae5f7!1.04 +amd64!arcconf!2.03.1!arcconf_v2_03_22476.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_03_22476.zip!e98c9f2fb11d368adc0378ddd9daad40!2.03 +amd64!arcconf!2.03.1!arcconf_v2_02_22404.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_02_22404.zip!373126b8d256aa76022906145a87d398!2.02 +amd64!arcconf!2.03.1!arcconf_v2_01_22270.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip!a51110590c3439245e5179a9e35bad86!2.01 +i386!arcconf!2.03.1!arcconf_v2_01_22270.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip!a51110590c3439245e5179a9e35bad86!2.01 +amd64!arcconf!2.03.1!arcconf_v2_00_21811.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_00_21811.zip!946ed3423254d893120ceb89f7779685!2.00 +i386!arcconf!2.03.1!arcconf_v2_00_21811.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v2_00_21811.zip!946ed3423254d893120ceb89f7779685!2.00 +amd64!arcconf!2.03.1!arcconf_v1_8_21375.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_8_21375.zip!7a697a7c8b99b66312116d4249ab1922!1.08 +i386!arcconf!2.03.1!arcconf_v1_8_21375.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_8_21375.zip!7a697a7c8b99b66312116d4249ab1922!1.08 +amd64!arcconf!2.03.1!arcconf_v1_7_21229.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_7_21229.zip!8d8e1829172bb72f69081b2ac6d2e50b!1.07 +i386!arcconf!2.03.1!arcconf_v1_7_21229.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_7_21229.zip!8d8e1829172bb72f69081b2ac6d2e50b!1.07 +amd64!arcconf!2.03.1!arcconf_v1_6_21062.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_6_21062.zip!32aa39da4ecca41c4cb987791f5aa656!1.06 +i386!arcconf!2.03.1!arcconf_v1_6_21062.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_6_21062.zip!32aa39da4ecca41c4cb987791f5aa656!1.06 +amd64!arcconf!2.03.1!arcconf_v1_5_20942.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_5_20942.zip!de7e676bdd9c04db8125d04086d9efd6!1.05 +i386!arcconf!2.03.1!arcconf_v1_5_20942.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_5_20942.zip!de7e676bdd9c04db8125d04086d9efd6!1.05 +amd64!arcconf!2.03.1!arcconf_v1_4_20859.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_4_20859.zip!6c3d72fe83ff76e68a70fa59d92ae5f7!1.04 +i386!arcconf!2.03.1!arcconf_v1_4_20859.zip!http://download.adaptec.com/raid/storage_manager/arcconf_v1_4_20859.zip!6c3d72fe83ff76e68a70fa59d92ae5f7!1.04 +amd64!arcconf!2.03.1!libstdc++-3.4.6-11.el4_8.1.x86_64.rpm!http://vault.centos.org/4.9/updates/x86_64/RPMS/libstdc++-3.4.6-11.el4_8.1.x86_64.rpm!0836ef4db3881047d4f708348b47f7be!centos4 +i386!arcconf!2.03.1!libstdc++-3.4.6-11.el4_8.1.i386.rpm!http://vault.centos.org/4.9/updates/i386/RPMS/libstdc++-3.4.6-11.el4_8.1.i386.rpm!713b67409b31e18da09f1657e5040510!centos4