sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (8f5669a2843a4b05436202e71f51a888910a8d28)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (8f5669a2843a4b05436202e71f51a888910a8d28)
- Date: Wed, 5 Oct 2011 15:45:25 -0500
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
mail/dspam/BUILD | 4
mail/dspam/CONFIGURE | 8
mail/dspam/DEPENDS | 5
mail/dspam/DETAILS | 14 -
mail/dspam/HISTORY | 9
mail/dspam/INSTALL | 2
mail/dspam/init.d/dspam | 1
net/spine/DEPENDS | 7
net/spine/DETAILS | 4
net/spine/HISTORY | 5
net/spine/patches/unified_issues.patch | 348
---------------------------------
net/unbound/DEPENDS | 6
net/unbound/HISTORY | 3
utils/kbd/DETAILS | 4
utils/kbd/HISTORY | 8
utils/kbd/PRE_BUILD | 1
utils/kbd/es-po.patch | 11 +
17 files changed, 69 insertions(+), 371 deletions(-)
New commits:
commit 67a9bc4b63ba4840ebe6284a1bbe74b1087d9e95
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
kbd: => 1.15.3
commit e6c404858f91f9a05e5d49dbc0fbace5e808a2b6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
dspam: version 3.10.1, switched off the devel version (3.9.x), made the
init script check/create the dir for the pidfile, homedir and logdir are
now configurable and default to the previous spell default (not upstream
default), added optional deps on procmail and WEBSERVER
commit 763889e3d1558cc0bf6225a882fb2397fcc60d29
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
spine: => 0.8.7h
commit 4c61ec26b8117e1186c3d6708dc117384b6e2dd2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
unbound: fix #266
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index 3edbe13..9ad3fc1 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -1,9 +1,9 @@
create_account dspam &&
-OPTS="--with-dspam-home=$INSTALL_ROOT/var/spool/dspam \
+OPTS="--with-dspam-home="${DSPAM_HOME}" \
--with-dspam-group=dspam \
--with-dspam-home-group=dspam \
- --with-logdir=$INSTALL_ROOT/var/log/dspam \
+ --with-logdir="${DSPAM_LOG}" \
--disable-mysql4-initialization \
$DSPAM_OPTS \
$OPTS" &&
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 6751c48..1c492cc 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -28,7 +28,7 @@ config_query_option DSPAM_OPTS 'Enable split configuration
file support?' y \
'--enable-split-configuration' \
'--disable-split-configuration' &&
-config_query_option DSPAM_OPTS 'Enable long usernames?' y \
+config_query_option DSPAM_OPTS 'Enable long usernames? (defaults to system
length)' y \
'--enable-long-usernames' \
'--disable-long-usernames' &&
@@ -43,4 +43,8 @@ config_query_option DSPAM_OPTS 'Enable performance
profiling?' n \
config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
'None' \
'Domain Scale' \
- 'Large Scale'
+ 'Large Scale' &&
+# the next 2 queries use the previous spell defaults instead of the upstream
+# default, to make sure the spell does not disrupt anything
+config_query_string DSPAM_HOME 'which home directory for dspam?'
'/var/spool/dspam'
+config_query_string DSPAM_LOG 'which log directory for dspam?'
'/var/log/dspam'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 103b2d5..ac3b72f 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -52,4 +52,7 @@ optional_depends clamav \
optional_depends SYSTEM-LOGGER \
'--enable-syslog' \
'--disable-syslog' \
- 'for logging through syslog'
+ 'for logging through syslog' &&
+
+optional_depends procmail '' '' 'for the default TrustedDeliveryAgent'
+optional_depends WEBSERVER '' '' 'for the web interface'
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index d51ae2d..73c8b52 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -10,14 +10,14 @@ if [[ $DSPAM_BRANCH == scm ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
-elif [[ $DSPAM_BRANCH == devel ]]; then
- VERSION=3.9.1-RC1
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+#elif [[ $DSPAM_BRANCH == devel ]]; then
+# VERSION=3.9.1-RC1
+# SOURCE="${SPELL}-${VERSION}.tar.gz"
+# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+#
SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
+#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=3.10.0
+ VERSION=3.10.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index c7f11c0..74167d1 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,12 @@
+2011-10-05 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.10.1 and commented out the devel version as the
+ release version was more recent anyway
+ * init.d/dspam: check for and create dir for pidfile as [/var]/run is
+ supposed to be on a tmpfs these days
+ * BUILD,CONFIGURE,INSTALL: made the homedir and logdir configurable so
+ the default config actually works
+ * DEPENDS: added optional deps on WEBSERVER and procmail
+
2011-08-20 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE: fixed typo
diff --git a/mail/dspam/INSTALL b/mail/dspam/INSTALL
index d0e03d1..4eecf20 100755
--- a/mail/dspam/INSTALL
+++ b/mail/dspam/INSTALL
@@ -1,3 +1,5 @@
+install -d -o dspam -g dspam -vm 770 "${INSTALL_ROOT}/${DSPAM_HOME}" &&
+install -d -o dspam -g dspam -vm 770 "${INSTALL_ROOT}/${DSPAM_LOG}" &&
default_install &&
# needed if one wants to build anything with it afterwards
cp src/pref.h ${INSTALL_ROOT}/usr/include/dspam/ &&
diff --git a/mail/dspam/init.d/dspam b/mail/dspam/init.d/dspam
index 4a48b32..f6fdfd5 100755
--- a/mail/dspam/init.d/dspam
+++ b/mail/dspam/init.d/dspam
@@ -11,6 +11,7 @@ NEEDS="+remote_fs +network"
start() {
echo "Starting $NAME..."
+ [[ -d /var/run/dspam ]] || mkdir -p /var/run/dspam
su root -c "$PROGRAM $ARGS"
evaluate_retval
}
diff --git a/net/spine/DEPENDS b/net/spine/DEPENDS
index 7627fd1..fd0277f 100755
--- a/net/spine/DEPENDS
+++ b/net/spine/DEPENDS
@@ -1,2 +1,7 @@
depends net-snmp &&
-depends MYSQL
+depends MYSQL &&
+
+optional_depends libcap \
+ "--enable-lcap" \
+ "--disable-lcap" \
+ "for Linux capabilities support"
diff --git a/net/spine/DETAILS b/net/spine/DETAILS
index 27a7865..13385aa 100755
--- a/net/spine/DETAILS
+++ b/net/spine/DETAILS
@@ -1,8 +1,8 @@
SPELL=spine
- VERSION=0.8.7g
+ VERSION=0.8.7h
SOURCE=cacti-$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:be0dd06649005085b2ef6c773e934e9dedd35d7c2d990637ae45347c5e27d8076f046f7b08ea497e183b688661b63b4135e6cecefe4c74f4b422f7008e90f117
+
SOURCE_HASH=sha512:681ea0849a477636348fbede7b11d04900cb3a2bbcb747deccaea31c67adfdb07f2692934a44de5975a142632154c7249ca66455c4f1beb1679bcfb56088e396
SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION"
WEB_SITE=http://www.cacti.net/spine_info.php
LICENSE[0]=LGPL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index 1fccfc0..eac4652 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,8 @@
+2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.7h
+ * DEPENDS: added libcap optional dependency
+ * patches: removed
+
2010-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.7g
* INSTALL: upstream finally fixed conf trashing issue
diff --git a/net/spine/patches/unified_issues.patch
b/net/spine/patches/unified_issues.patch
deleted file mode 100644
index d24cdaa..0000000
--- a/net/spine/patches/unified_issues.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-diff -ruBbd cacti-spine-0.8.7g.old/ChangeLog cacti-spine-0.8.7g/ChangeLog
---- cacti-spine-0.8.7g.old/ChangeLog 2010-07-09 19:25:56.000000000 -0400
-+++ cacti-spine-0.8.7g/ChangeLog 2010-08-31 20:21:22.000000000 -0400
-@@ -1,5 +1,13 @@
- The Cacti Group | spine
-
-+Patched 0.8.7g
-+-bug#0001669: Problems with getting data from script using SPINE on Windows
Server 2003 x32
-+-bug#0001829: Wrong string numerical value got from Spine SNMP poller
-+-bug: Net-snmp API issues cause spine crashes with some SNMP agents
-+-bug: Host list not properly initialized
-+-bug: Mutex locking issues cause deadlocks in Windows
-+-bug: Escape windows type back slashes in scripts
-+
- 0.8.7g
- -feature: Multi threaded host polling
-
-diff -ruBbd cacti-spine-0.8.7g.old/poller.c cacti-spine-0.8.7g/poller.c
---- cacti-spine-0.8.7g.old/poller.c 2010-07-09 17:39:53.000000000 -0400
-+++ cacti-spine-0.8.7g/poller.c 2010-08-31 20:18:58.000000000 -0400
-@@ -57,21 +57,26 @@
- host_data_ids = poller_details.host_data_ids;
- snprintf(host_time, SMALL_BUFSIZE, "%s", poller_details.host_time);
-
-- thread_mutex_unlock(LOCK_THREAD);
--
- free(arg);
-
-+ thread_ready = TRUE;
-+
- SPINE_LOG_DEBUG(("DEBUG: In Poller, About to Start Polling of Host"));
-
- poll_host(host_id, host_thread, last_host_thread, host_data_ids,
host_time);
-
-- thread_mutex_lock(LOCK_THREAD);
--
-+ while (TRUE) {
-+ if (thread_mutex_trylock(LOCK_THREAD) == 0) {
- active_threads--;
-+ thread_mutex_unlock(LOCK_THREAD);
-
-- SPINE_LOG_DEBUG(("DEBUG: The Value of Active Threads is %i"
,active_threads));
-+ break;
-+ }
-
-- thread_mutex_unlock(LOCK_THREAD);
-+ usleep(100);
-+ }
-+
-+ SPINE_LOG_DEBUG(("DEBUG: The Value of Active Threads is %i"
,active_threads));
-
- /* end the thread */
- pthread_exit(0);
-@@ -965,7 +970,7 @@
- poll_result = exec_poll(host,
poller_items[i].arg1);
-
- /* process the result */
-- if ((is_numeric(poll_result)) ||
(is_multipart_output(poll_result))) {
-+ if ((is_numeric(poll_result)) ||
(is_multipart_output(trim(poll_result)))) {
- snprintf(poller_items[i].result,
RESULTS_BUFFER, "%s", poll_result);
- }else if (is_hexadecimal(snmp_oids[j].result,
TRUE)) {
- snprintf(poller_items[i].result,
RESULTS_BUFFER, "%lld", hex2dec(poll_result));
-@@ -998,7 +1003,7 @@
- poll_result = php_cmd(poller_items[i].arg1,
php_process);
-
- /* process the output */
-- if ((is_numeric(poll_result)) ||
(is_multipart_output(poll_result))) {
-+ if ((is_numeric(poll_result)) ||
(is_multipart_output(trim(poll_result)))) {
- snprintf(poller_items[i].result,
RESULTS_BUFFER, "%s", poll_result);
- }else if (is_hexadecimal(snmp_oids[j].result,
TRUE)) {
- snprintf(poller_items[i].result,
RESULTS_BUFFER, "%lld", hex2dec(poll_result));
-@@ -1247,7 +1252,7 @@
- if (is_numeric(result)) {
- return TRUE;
- }else{
-- if (is_multipart_output(result)) {
-+ if (is_multipart_output(trim(result))) {
- return TRUE;
- }else{
- return FALSE;
-@@ -1290,7 +1295,7 @@
-
- /* compensate for back slashes in arguments */
- #if defined(__CYGWIN__)
-- proc_command = add_slashes(command, 2);
-+ proc_command = add_slashes(command);
- #else
- proc_command = command;
- #endif
-@@ -1340,7 +1345,7 @@
- FD_SET(cmd_fd, &fds);
-
- /* wait x seonds for pipe response */
-- switch (select(cmd_fd+1, &fds, NULL, NULL, &timeout)) {
-+ switch (select(FD_SETSIZE, &fds, NULL, NULL, &timeout)) {
- case -1:
- switch (errno) {
- case EBADF:
-@@ -1381,11 +1386,13 @@
- break;
- }
- case 0:
-+ #ifdef USING_TPOPEN
- SPINE_LOG(("Host[%i] ERROR: The POPEN timed out",
current_host->id));
-
-- #ifdef USING_TPOPEN
- close_fd = FALSE;
- #else
-+ SPINE_LOG(("Host[%i] ERROR: The NIFTY POPEN timed
out", current_host->id));
-+
- pid = nft_pchild(cmd_fd);
- kill(pid, SIGKILL);
- #endif
-diff -ruBbd cacti-spine-0.8.7g.old/snmp.c cacti-spine-0.8.7g/snmp.c
---- cacti-spine-0.8.7g.old/snmp.c 2010-07-09 17:39:53.000000000 -0400
-+++ cacti-spine-0.8.7g/snmp.c 2010-08-31 20:18:58.000000000 -0400
-@@ -499,13 +499,9 @@
- size_t out_len = 0;
-
- if ((buf = (u_char *) calloc(buf_len, 1)) != 0) {
-- if (sprint_realloc_value(&buf, &buf_len, &out_len, 1,
-- objid, objidlen, variable)) {
-+ sprint_realloc_by_type(&buf, &buf_len, &out_len, 1, variable,
NULL, NULL, NULL);
- snprintf(obuf, buf_len, "%s", buf);
- }else{
-- snprintf(obuf, buf_len, "%s [TRUNCATED]", buf);
-- }
-- }else{
- SET_UNDEFINED(obuf);
- }
-
-@@ -528,6 +524,7 @@
- int i;
- int array_count;
- int index_count;
-+ char temp_result[RESULTS_BUFFER];
-
- struct nameStruct {
- oid name[MAX_OID_LEN];
-@@ -570,11 +567,13 @@
- for(i = 0; i < num_oids && vars; i++) {
- if
(!IS_UNDEFINED(snmp_oids[i].result)) {
- #ifdef USE_NET_SNMP
--
snmp_snprint_value(snmp_oids[i].result, RESULTS_BUFFER, vars->name,
vars->name_length, vars);
-+
snmp_snprint_value(temp_result, RESULTS_BUFFER, vars->name,
vars->name_length, vars);
- #else
--
sprint_value(snmp_oids[i].result, vars->name, vars->name_length, vars);
-+ sprint_value(temp_result,
vars->name, vars->name_length, vars);
- #endif
-
-+ snprintf(snmp_oids[i].result,
RESULTS_BUFFER, "%s", trim(temp_result));
-+
- vars = vars->next_variable;
- }
- }
-diff -ruBbd cacti-spine-0.8.7g.old/spine.c cacti-spine-0.8.7g/spine.c
---- cacti-spine-0.8.7g.old/spine.c 2010-07-09 17:39:53.000000000 -0400
-+++ cacti-spine-0.8.7g/spine.c 2010-08-31 20:18:58.000000000 -0400
-@@ -94,6 +94,7 @@
- int num_hosts = 0;
- int active_threads = 0;
- int active_scripts = 0;
-+int thread_ready = FALSE;
-
- config_t set;
- php_t *php_processes = 0;
-@@ -134,7 +135,7 @@
- int poller_counter = 0;
- int last_active_threads = 0;
- int valid_conf_file = FALSE;
-- long int EXTERNAL_THREAD_SLEEP = 5000;
-+ long int EXTERNAL_THREAD_SLEEP = 50;
- long int internal_thread_sleep;
- char querybuf[BIG_BUFSIZE], *qp = querybuf;
- char *host_time = NULL;
-@@ -196,6 +197,7 @@
-
- /* we attempt to support scripts better in cygwin */
- #if defined(__CYGWIN__)
-+ setenv("CYGWIN", "nodosfilewarning", 1);
- if (file_exists("./sh.exe")) {
- set.cygwinshloc = 0;
- printf("NOTE: The Shell Command Exists in the current
directory\n");
-@@ -281,7 +283,7 @@
-
- else if (STRMATCH(arg, "-H") ||
- STRIMATCH(arg, "--hostlist")) {
-- snprintf(set.host_id_list, BIG_BUFSIZE, getarg(opt,
&argv));
-+ snprintf(set.host_id_list, BIG_BUFSIZE, "%s",
getarg(opt, &argv));
- }
-
- else if (STRMATCH(arg, "-h") ||
-@@ -584,6 +586,11 @@
- poller_details->host_data_ids = itemsPT;
- poller_details->host_time = host_time;
-
-+ /* this variable tells us that the child had
loaded the poller
-+ * poller_details structure and we can move
on to the next thread
-+ */
-+ thread_ready = FALSE;
-+
- /* create child process */
- thread_status =
pthread_create(&threads[device_counter], &attr, child, poller_details);
-
-@@ -596,6 +603,11 @@
- }
- active_threads++;
-
-+ /* wait for the child to read
and process the structure */
-+ while (!thread_ready) {
-+
usleep(internal_thread_sleep);
-+ }
-+
- SPINE_LOG_DEBUG(("DEBUG: The
Value of Active Threads is %i", active_threads));
-
- break;
-@@ -603,7 +615,7 @@
- SPINE_LOG(("ERROR: The System
Lacked the Resources to Create a Thread"));
- break;
- case EFAULT:
-- SPINE_LOG(("ERROR: The Thread
or Attribute Was Invalid"));
-+ SPINE_LOG(("ERROR: The Thread
or Attribute were Invalid"));
- break;
- case EINVAL:
- SPINE_LOG(("ERROR: The Thread
Attribute is Not Initialized"));
-@@ -613,6 +625,8 @@
- break;
- }
-
-+ thread_mutex_unlock(LOCK_THREAD);
-+
- /* get current time and exit program if time
limit exceeded */
- if (poller_counter >= 20) {
- current_time = get_time_as_double();
-diff -ruBbd cacti-spine-0.8.7g.old/spine.h cacti-spine-0.8.7g/spine.h
---- cacti-spine-0.8.7g.old/spine.h 2010-07-09 17:39:53.000000000 -0400
-+++ cacti-spine-0.8.7g/spine.h 2010-08-31 20:18:58.000000000 -0400
-@@ -504,5 +504,6 @@
- extern char start_datetime[20];
- extern char config_paths[CONFIG_PATHS][BUFSIZE];
- extern int active_threads;
-+extern int thread_ready;
-
- #endif /* not _SPINE_H_ */
-diff -ruBbd cacti-spine-0.8.7g.old/util.c cacti-spine-0.8.7g/util.c
---- cacti-spine-0.8.7g.old/util.c 2010-07-09 17:39:53.000000000 -0400
-+++ cacti-spine-0.8.7g/util.c 2010-08-31 20:18:58.000000000 -0400
-@@ -755,7 +755,7 @@
- /* empty string is not all digits */
- if ( *string == '\0' ) return FALSE;
-
-- while ( isdigit(*string) )
-+ while ( isdigit((int)*string) )
- string++;
-
- return *string == '\0';
-@@ -773,7 +773,7 @@
- */
- int is_ipaddress(const char *string) {
- while (*string) {
-- if ((isdigit(*string)) ||
-+ if ((isdigit((int)*string)) ||
- (*string == '.') ||
- (*string == ':')) {
- string++;
-@@ -887,7 +887,7 @@
- i = strlen(string);
-
- while (i >= 0) {
-- if (isdigit(string[i])) {
-+ if (isdigit((int)string[i])) {
- break;
- }else{
- string[i] = '\0';
-@@ -898,17 +898,15 @@
- return string;
- }
-
--/*! \fn char *add_slashes(char *string, int arguments_2_strip)
-- * \brief change all backslashes to forward slashes for the first n
arguements.
-+/*! \fn char *add_slashes(char *string)
-+ * \brief add escaping to back slashes on for Windows type commands.
- * \param string the string to replace slashes
-- * \param arguments_2_strip the number of space delimited arguments to
reverse
- *
- * \return a pointer to the modified string. Variable must be freed by
parent.
- *
- */
--char *add_slashes(char *string, int arguments_2_strip) {
-+char *add_slashes(char *string) {
- int length;
-- int space_count;
- int position;
- int new_position;
- char *return_str;
-@@ -919,9 +917,8 @@
- return_str[0] = '\0';
-
- length = strlen(string);
-- space_count = 0;
- position = 0;
-- new_position = position;
-+ new_position = 0;
-
- /* simply return on blank string */
- if (!length) {
-@@ -931,17 +928,9 @@
- while (position < length) {
- /* backslash detected, change to forward slash */
- if (string[position] == '\\') {
-- /* only add slashes for first x arguments */
-- if (space_count < arguments_2_strip) {
-- return_str[new_position] = '/';
-- }else{
-- return_str[new_position] = string[position];
-- }
-- /* end of argument detected */
-- }else if (string[position] == ' ') {
-- return_str[new_position] = ' ';
-- space_count++;
-- /* normal character detected */
-+ return_str[new_position] = '\\';
-+ new_position++;
-+ return_str[new_position] = '\\';
- }else{
- return_str[new_position] = string[position];
- }
-@@ -1248,7 +1237,7 @@
- seteuid(0);
-
- if (geteuid() != 0) {
-- SPINE_LOG_DEBUG(("WARNING: Spine NOT running asroot. This is
require if using ICMP. Please run \"chmod +s;chown root:root spine\" to
resolve."));
-+ SPINE_LOG_DEBUG(("WARNING: Spine NOT running asroot. This is
required if using ICMP. Please run \"chmod +s;chown root:root spine\" to
resolve."));
- set.icmp_avail = FALSE;
- }else{
- SPINE_LOG_DEBUG(("DEBUG: Spine is running asroot."));
-diff -ruBbd cacti-spine-0.8.7g.old/util.h cacti-spine-0.8.7g/util.h
---- cacti-spine-0.8.7g.old/util.h 2010-07-09 17:39:53.000000000 -0400
-+++ cacti-spine-0.8.7g/util.h 2010-08-31 20:18:58.000000000 -0400
-@@ -54,7 +54,7 @@
- extern int is_hexadecimal(const char * str, const short ignore_space);
-
- /* string and file functions */
--extern char *add_slashes(char *string, int arguments_2_strip);
-+extern char *add_slashes(char *string);
- extern int file_exists(const char *filename);
- extern char *strip_alpha(char *string);
- extern char *strncopy(char *dst, const char *src, size_t n);
diff --git a/net/unbound/DEPENDS b/net/unbound/DEPENDS
index 7f6d411..a633aed 100755
--- a/net/unbound/DEPENDS
+++ b/net/unbound/DEPENDS
@@ -1,6 +1,2 @@
depends expat &&
-optional_depends ldns \
- "" \
- "--with-ldns-builtin" \
- "to use system ldns library, otherwise a builtin version
is used"
-
+depends ldns
diff --git a/net/unbound/HISTORY b/net/unbound/HISTORY
index a7b1e3a..dab2657 100644
--- a/net/unbound/HISTORY
+++ b/net/unbound/HISTORY
@@ -1,3 +1,6 @@
+2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: ldns is required now (since 1.4.12)
+
2011-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.12
diff --git a/utils/kbd/DETAILS b/utils/kbd/DETAILS
index 62c6b45..78d5ae3 100755
--- a/utils/kbd/DETAILS
+++ b/utils/kbd/DETAILS
@@ -1,6 +1,6 @@
SPELL=kbd
- VERSION=1.15.2
-
SOURCE_HASH=sha512:8fd80e61699c6869a42e93a3c0833e054e3b8dfe9ec2999b2ba205b08b54ccb675af04eb75a2446ecdecc233e6dfa79f8475b11a75e3812a4afe4d3fc59c7b2e
+ VERSION=1.15.3
+
SOURCE_HASH=sha512:11b41eada434644bc1def1c896bb6f10a1cd5a4e7ab285348d7f70e7c950ab0f4e4a99e3d45137ea44dbaeb098da733677b4399eb8bb271ffc32e45545db58f3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.altlinux.org/pub/people/legion/$SPELL/$SOURCE
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index fbbe9b6..a0d692e 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,8 +1,14 @@
+2011-10-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.15.3
+ * PRE_BUILD: apply the patch
+ * es-po.patch: added, to fix build
+
2010-05-18 Robert Figura <template AT sourcemage.org>
* DEPENDS: added automake
+
2010-04-11 Treeve Jelbert <treeve AT sourcemage.org
* DETAILS: version 1.15.2
->
+
2009-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.15.1
* DEPENDS, PRE_BUILD: added autoconf
diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
index 2c09365..b067985 100755
--- a/utils/kbd/PRE_BUILD
+++ b/utils/kbd/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SPELL_DIRECTORY/fgconsole-serial.patch &&
+patch -p1 < $SPELL_DIRECTORY/es-po.patch &&
autoreconf
diff --git a/utils/kbd/es-po.patch b/utils/kbd/es-po.patch
new file mode 100644
index 0000000..578f0a7
--- /dev/null
+++ b/utils/kbd/es-po.patch
@@ -0,0 +1,11 @@
+--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200
++++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200
+@@ -1363,7 +1363,7 @@
+ #: src/setfont.c:682
+ #, c-format
+ msgid "Saved %d-char %dx%d font file on %s\n"
+-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en
%s\n"
++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
+
+ #: src/setkeycodes.c:21
+ #, c-format
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (8f5669a2843a4b05436202e71f51a888910a8d28), Vlad Glagolev, 10/05/2011
Archive powered by MHonArc 2.6.24.