Browse Source

bcron: Updated (0.10 -> 0.11)

master
Nagy Károly Gábriel 10 years ago
parent
commit
eec8a6b722
3 changed files with 24 additions and 39 deletions
  1. +0
    -31
      base/bcron/bcron-0.10-no-python.patch
  2. +21
    -5
      base/bcron/bcron-0.11-combined.patch
  3. +3
    -3
      base/bcron/bcron.desc

+ 0
- 31
base/bcron/bcron-0.10-no-python.patch

@ -1,31 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/bcron-0.10-no-python.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Do not use python for generating 'conf_sendmail.c' from 'conf-sendmail'
--- a/Makefile 2013-04-18 13:32:07.380724339 +0200
+++ b/Makefile 2013-04-18 13:32:23.460768578 +0200
@@ -90,7 +90,9 @@
chmod 755 compile
conf_sendmail.c: conf-sendmail
- python -c 'import shlex; line=shlex.split(open("conf-sendmail").readline().strip()); print "const char* sendmail[] = { "+",".join(["\"%s\""%a for a in line])+",NULL };"' >conf_sendmail.c
+ ( confsendmail=`head -n 1 conf-sendmail | tr -s ' '`; \
+ printf "const char* sendmail[] = { `for x in $${confsendmail}; do printf '\"%s\",' $${x}; done`NULL };\n" \
+ ) >conf_sendmail.c
connection.o: compile connection.c bcron.h
./compile connection.c

base/bcron/bcron-0.10-make-install.patch → base/bcron/bcron-0.11-combined.patch

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/bcron-0.10-make-install.patch
# Copyright (C) 2013 The OpenSDE Project
# Filename: package/.../bcron/bcron-0.11-combined.patch
# Copyright (C) 2015 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,8 +14,12 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2013-04-18 13:41:10.011910953 +0200
+++ ./Makefile 2013-04-18 13:58:39.876580718 +0200
1. Make Makefile a bit more autostuff friendly.
2. Do not use python for generating 'conf_sendmail.c' from 'conf-sendmail'
--- ./Makefile.orig 2015-08-12 19:07:28.000000000 +0300
+++ ./Makefile 2015-10-06 19:24:21.518109604 +0300
@@ -4,6 +4,14 @@
SHELL=/bin/sh
@ -31,7 +35,18 @@
DEFAULT: all
all: libraries programs docs
@@ -109,8 +117,21 @@
@@ -89,7 +97,9 @@
chmod 755 compile
conf_sendmail.c: conf-sendmail
- python -c 'import shlex; line=shlex.split(open("conf-sendmail").readline().strip()); print("const char* sendmail[] = { "+",".join(["\"%s\""%a for a in line])+",NULL };")' >conf_sendmail.c
+ ( confsendmail=`head -n 1 conf-sendmail | tr -s ' '`; \
+ printf "const char* sendmail[] = { `for x in $${confsendmail}; do printf '\"%s\",' $${x}; done`NULL };\n" \
+ ) >conf_sendmail.c
connection.o: compile connection.c bcron.h
./compile connection.c
@@ -106,8 +116,21 @@
docs: bcron.info bcron.html crontab.5.html bcrontab.1.html bcron-spool.8.html bcron-sched.8.html bcron-exec.8.html bcron-start.8.html bcron-update.8.html
install: INSTHIER conf-bin conf-man
@ -55,3 +70,4 @@
job.o: compile job.c bcron.h
./compile job.c

+ 3
- 3
base/bcron/bcron.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../bcron/bcron.desc
[COPY] Copyright (C) 2006 - 2013 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2015 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@ -32,8 +32,8 @@
[L] GPL
[S] Stable
[V] 0.10
[V] 0.11
[P] O -----5---9 210.000
[D] 2997335370 bcron-0.10.tar.gz http://untroubled.org/bcron/
[D] 1579605698 bcron-0.11.tar.gz http://untroubled.org/bcron/

Loading…
Cancel
Save