| 1 |
jlec 13/06/30 14:52:47 |
| 2 |
|
| 3 |
Modified: boinc.init generate_tarball.sh |
| 4 |
Added: boinc-7.2.0-fix_subdirs.patch |
| 5 |
Removed: 7.0.2-fix_subdirs.patch |
| 6 |
Log: |
| 7 |
sci-misc/boinc: Version bump and drop old, fixes: security issue, #467908; link problems, #464772; correlation with abrupt time changes through ntp, #413041; menu items with newer x11-libs/wxGTK, #379979 & #376237 |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.30 sci-misc/boinc/files/boinc.init |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc.init?rev=1.30&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc.init?rev=1.30&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc.init?r1=1.29&r2=1.30 |
| 17 |
|
| 18 |
Index: boinc.init |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/sci-misc/boinc/files/boinc.init,v |
| 21 |
retrieving revision 1.29 |
| 22 |
retrieving revision 1.30 |
| 23 |
diff -u -r1.29 -r1.30 |
| 24 |
--- boinc.init 23 Oct 2011 18:55:54 -0000 1.29 |
| 25 |
+++ boinc.init 30 Jun 2013 14:52:47 -0000 1.30 |
| 26 |
@@ -4,7 +4,7 @@ |
| 27 |
|
| 28 |
depend() { |
| 29 |
# we can use dns and net, but we can also in most cases live without them |
| 30 |
- use dns net |
| 31 |
+ use dns net ntp-client ntpd |
| 32 |
} |
| 33 |
|
| 34 |
create_work_directory() { |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 sci-misc/boinc/files/generate_tarball.sh |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/generate_tarball.sh?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/generate_tarball.sh?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/generate_tarball.sh?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: generate_tarball.sh |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-misc/boinc/files/generate_tarball.sh,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- generate_tarball.sh 22 May 2011 09:22:59 -0000 1.2 |
| 51 |
+++ generate_tarball.sh 30 Jun 2013 14:52:47 -0000 1.3 |
| 52 |
@@ -1,5 +1,5 @@ |
| 53 |
#!/usr/bin/env bash |
| 54 |
-## $Id: generate_tarball.sh,v 1.2 2011/05/22 09:22:59 scarabeus Exp $ |
| 55 |
+## $Id: generate_tarball.sh,v 1.3 2013/06/30 14:52:47 jlec Exp $ |
| 56 |
## Modified by scarabeus 2008-10-23 |
| 57 |
############################################################################### |
| 58 |
# functions |
| 59 |
@@ -31,7 +31,7 @@ |
| 60 |
############################################################################### |
| 61 |
# variable definition |
| 62 |
############################################################################### |
| 63 |
-SVN_URI="http://boinc.berkeley.edu/svn/tags/boinc_core_release_${VERSION//./_}" |
| 64 |
+GIT_URI="git://boinc.berkeley.edu/boinc-v2.git" |
| 65 |
PACKAGE="boinc-${VERSION}" |
| 66 |
BUNDLE_PREFIX="boinc-dist" |
| 67 |
LOG=linux.log |
| 68 |
@@ -44,11 +44,15 @@ |
| 69 |
touch "${LOG}" |
| 70 |
echo "" > "${LOG}" # LOG CLEANUP |
| 71 |
############################################################################### |
| 72 |
-# get data from svn |
| 73 |
+# get data from GIT |
| 74 |
############################################################################### |
| 75 |
-echo "<Downloading files from SVN repository>" |
| 76 |
+echo "<Downloading files from GIT repository>" |
| 77 |
echo "<******************************>" |
| 78 |
-svn export ${SVN_URI} ${PACKAGE} >> "${LOG}" |
| 79 |
+# No direct archive possible |
| 80 |
+git clone ${GIT_URI} ${PACKAGE} >> "${LOG}" |
| 81 |
+pushd "${PACKAGE}" > /dev/null |
| 82 |
+git checkout -b gentoo client_release/${VERSION%.*}/${VERSION} || exit 0 |
| 83 |
+popd > /dev/null |
| 84 |
############################################################################### |
| 85 |
# cleanup files we fetched |
| 86 |
############################################################################### |
| 87 |
@@ -76,14 +80,18 @@ |
| 88 |
#rm -rf locale/*/*.mo # translations should be generated on user machines |
| 89 |
# Actualy they dont generate them |
| 90 |
rm -rf zlib/ |
| 91 |
+rm -rf zip/ |
| 92 |
rm -rf openssl/ |
| 93 |
|
| 94 |
+git commit -a -m "Cleaned" |
| 95 |
+ |
| 96 |
popd > /dev/null |
| 97 |
|
| 98 |
############################################################################### |
| 99 |
# create tbz |
| 100 |
############################################################################### |
| 101 |
-tar cJf "${PACKAGE}".tar.xz ${PACKAGE} >> "${LOG}" |
| 102 |
+git archive --prefix=${PACKAGE}/ --remote=${PACKAGE} gentoo -o ${PACKAGE}.tar |
| 103 |
+xz -ve9 "${PACKAGE}".tar | tee -a "${LOG}" |
| 104 |
find ./ -maxdepth 1 -type f -name \*.tar.xz -print | while read FILE ; do |
| 105 |
echo "FILE: ${FILE}" |
| 106 |
echo " SIZE: $(`which du` -h ${FILE} |`which awk` -F' ' '{print $1}')" |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.1 sci-misc/boinc/files/boinc-7.2.0-fix_subdirs.patch |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc-7.2.0-fix_subdirs.patch?rev=1.1&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc-7.2.0-fix_subdirs.patch?rev=1.1&content-type=text/plain |
| 114 |
|
| 115 |
Index: boinc-7.2.0-fix_subdirs.patch |
| 116 |
=================================================================== |
| 117 |
Makefile.am | 14 +++++++------- |
| 118 |
configure.ac | 5 ----- |
| 119 |
2 files changed, 7 insertions(+), 12 deletions(-) |
| 120 |
|
| 121 |
diff --git a/Makefile.am b/Makefile.am |
| 122 |
index 6322db1..45d8b67 100644 |
| 123 |
--- a/Makefile.am |
| 124 |
+++ b/Makefile.am |
| 125 |
@@ -10,13 +10,13 @@ ACLOCAL_AMFLAGS = -I m4 |
| 126 |
|
| 127 |
if ENABLE_LIBRARIES |
| 128 |
API_SUBDIRS = api lib |
| 129 |
-if ENABLE_SERVER |
| 130 |
- API_SUBDIRS += zip |
| 131 |
-endif |
| 132 |
+#if ENABLE_SERVER |
| 133 |
+# API_SUBDIRS += zip |
| 134 |
+#endif |
| 135 |
endif |
| 136 |
|
| 137 |
if ENABLE_SERVER |
| 138 |
- SERVER_SUBDIRS = db test py sched apps tools vda html |
| 139 |
+ SERVER_SUBDIRS = db test py sched apps tools vda |
| 140 |
## once contained samples/example_app which breaks out-of-source-tree builds |
| 141 |
endif |
| 142 |
|
| 143 |
@@ -26,9 +26,9 @@ endif |
| 144 |
|
| 145 |
if ENABLE_MANAGER |
| 146 |
CLIENTGUI_SUBDIRS = clientgui locale |
| 147 |
-if BUILD_X11_SCREENSAVER |
| 148 |
- CLIENTGUI_SUBDIRS += clientscr |
| 149 |
-endif |
| 150 |
+#if BUILD_X11_SCREENSAVER |
| 151 |
+# CLIENTGUI_SUBDIRS += clientscr |
| 152 |
+#endif |
| 153 |
endif |
| 154 |
|
| 155 |
# ORDER MATTERS below. One must build dependencies FIRST, then things |
| 156 |
diff --git a/configure.ac b/configure.ac |
| 157 |
index 2bef437..5a9e104 100644 |
| 158 |
--- a/configure.ac |
| 159 |
+++ b/configure.ac |
| 160 |
@@ -955,7 +955,6 @@ AC_CONFIG_FILES([ |
| 161 |
apps/Makefile |
| 162 |
clientgui/Makefile |
| 163 |
clientgui/res/Makefile |
| 164 |
- clientscr/Makefile |
| 165 |
client/Makefile |
| 166 |
client/win/boinc_path_config.py:py/boinc_path_config.py.in |
| 167 |
client/scripts/Makefile |
| 168 |
@@ -963,7 +962,6 @@ AC_CONFIG_FILES([ |
| 169 |
db/Makefile |
| 170 |
doc/Makefile |
| 171 |
doc/manpages/Makefile |
| 172 |
- html/Makefile |
| 173 |
lib/Makefile |
| 174 |
locale/Makefile |
| 175 |
Makefile |
| 176 |
@@ -993,9 +991,6 @@ AC_CONFIG_FILES([ |
| 177 |
tools/boinc_path_config.py:py/boinc_path_config.py.in |
| 178 |
tools/Makefile |
| 179 |
vda/Makefile |
| 180 |
- zip/Makefile |
| 181 |
- zip/zip/Makefile |
| 182 |
- zip/unzip/Makefile |
| 183 |
m4/Makefile |
| 184 |
]) |
Archives