[or-cvs] r12585: made catalyst stage/livecd build scripts more verbose added (in incognito/trunk: . portage.overlay/kde-misc/tork portage.overlay/kde-misc/tork/files)

anonym at seul.org anonym at seul.org
Wed Nov 28 15:07:09 UTC 2007


Author: anonym
Date: 2007-11-28 10:07:09 -0500 (Wed, 28 Nov 2007)
New Revision: 12585

Added:
   incognito/trunk/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch
Modified:
   incognito/trunk/build-stage.sh
   incognito/trunk/livecd-stage2.sh
   incognito/trunk/portage.overlay/kde-misc/tork/Manifest
Log:
made catalyst stage/livecd build scripts more verbose
added missing TorK tsocks patch


Modified: incognito/trunk/build-stage.sh
===================================================================
--- incognito/trunk/build-stage.sh	2007-11-28 12:13:43 UTC (rev 12584)
+++ incognito/trunk/build-stage.sh	2007-11-28 15:07:09 UTC (rev 12585)
@@ -35,7 +35,7 @@
 NICECMD=""
 [[ -x "/usr/bin/ionice" ]] && NICECMD="/usr/bin/ionice -c 3"
 [[ -x "/usr/bin/schedtool" ]] && NICECMD="/usr/bin/schedtool -B -n 8 -e ${NICECMD}"
-${NICECMD} catalyst -f "${DIR}/stage.spec"
+${NICECMD} catalyst -v -f "${DIR}/stage.spec"
 CATALYST_STATUS=$?
 
 # Clean up

Modified: incognito/trunk/livecd-stage2.sh
===================================================================
--- incognito/trunk/livecd-stage2.sh	2007-11-28 12:13:43 UTC (rev 12584)
+++ incognito/trunk/livecd-stage2.sh	2007-11-28 15:07:09 UTC (rev 12585)
@@ -126,7 +126,7 @@
 NICECMD=""
 [[ -x "/usr/bin/ionice" ]] && NICECMD="/usr/bin/ionice -c 3"
 [[ -x "/usr/bin/schedtool" ]] && NICECMD="/usr/bin/schedtool -B -n 8 -e ${NICECMD}"
-${NICECMD} catalyst -f "${DIR}/livecd-stage2.spec"
+${NICECMD} catalyst -v -f "${DIR}/livecd-stage2.spec"
 CATALYST_STATUS=$?
 
 # Clean up

Modified: incognito/trunk/portage.overlay/kde-misc/tork/Manifest
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/tork/Manifest	2007-11-28 12:13:43 UTC (rev 12584)
+++ incognito/trunk/portage.overlay/kde-misc/tork/Manifest	2007-11-28 15:07:09 UTC (rev 12585)
@@ -1,3 +1,7 @@
+AUX tork-0.20-ext_tsocks.patch 952 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 SHA1 ebfe42ae5ede7ef3c9a82ee17e77912c9b8d7c57 SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008
+MD5 3409319ab9854ef8db2e4eab5f7b60a8 files/tork-0.20-ext_tsocks.patch 952
+RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 files/tork-0.20-ext_tsocks.patch 952
+SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008 files/tork-0.20-ext_tsocks.patch 952
 DIST tork-0.23.tar.bz2 3193372 RMD160 1d1d8e6a38b75db97e402262b520e84f582fb319 SHA1 31f1e4e3da5dced0d1a4f1cfc9b7d71e5d288062 SHA256 16bf30c927822a76260777ada138d528de122680629cc61d7f2406456f9ebf47
 EBUILD tork-0.23.ebuild 1213 RMD160 bf9a571ce1823d0ea81e90655a0622f6d59875bd SHA1 bb85f5f83ec974ce341fe0e869e1dc49d0d06ad8 SHA256 a1f00851029abd4797a5102e072f54e4cf448bc4c9a712a04322278e7ee429ff
 MD5 09f1c759b9cc19a5e500828ba73f002f tork-0.23.ebuild 1213

Added: incognito/trunk/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch	                        (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch	2007-11-28 15:07:09 UTC (rev 12585)
@@ -0,0 +1,24 @@
+diff -Naur tork-0.20.orig/src/Makefile.am tork-0.20/src/Makefile.am
+--- tork-0.20.orig/src/Makefile.am	2007-09-09 09:27:09.000000000 +0200
++++ tork-0.20/src/Makefile.am	2007-09-27 18:44:35.000000000 +0200
+@@ -11,9 +11,9 @@
+ geoipdir=GeoIP-1.4.0
+ endif
+ 
+-tsocks=tsocks
++tsocks=-ltsocks
+ 
+-SUBDIRS=icons about arkollon $(geoipdir) $(tsocks) privoxytemplates libwhich torkapplet konqplugin tor_ioslave .
++SUBDIRS=icons about arkollon $(geoipdir) privoxytemplates libwhich torkapplet konqplugin tor_ioslave .
+ 
+ DISTCLEANFILES=dcoptork.kidl
+ 
+@@ -27,7 +27,7 @@
+ tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) libwhich/libwhich.la
++tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(tsocks) libwhich/libwhich.la
+ 
+ # which sources should be compiled for tork
+ tork_SOURCES = trayicon.cpp trayhoverpopup.cpp chart.cpp configdialog.cpp crashhandler.cpp crypto.cpp \



More information about the tor-commits mailing list