diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | debian/boca-submission-tools.postinst | 6 | ||||
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | src/private/run-past.code.sample | 1 | ||||
| -rwxr-xr-x | tools/boca-checkinternet | 4 |
5 files changed, 24 insertions, 4 deletions
@@ -46,4 +46,5 @@ install-submission-tools: tools/boca-submit-run-root-wrapper install tools/cron-logroot $(DESTDIR)/etc/cron.d/ install tools/boca-submit-run-root-wrapper $(DESTDIR)/usr/bin/ install tools/boca-outmanage $(DESTDIR)/usr/sbin/ + install tools/boca-checkinternet $(DESTDIR)/usr/sbin/ chmod 4555 $(DESTDIR)/usr/bin/boca-submit-run-root-wrapper diff --git a/debian/boca-submission-tools.postinst b/debian/boca-submission-tools.postinst index 7621732..17945a4 100644 --- a/debian/boca-submission-tools.postinst +++ b/debian/boca-submission-tools.postinst @@ -3,5 +3,7 @@ #Make sure wrapper is suid chmod 4555 /usr/bin/boca-submit-run-root-wrapper -ln -s /usr/bin/boca-submit-run /usr/bin/boca-submit-list -ln -s /usr/bin/boca-submit-run /usr/bin/boca-submit-oldlist +for i in boca-submit-list boca-submit-oldlist; do + rm -f /usr/bin/$i || true + ln -s /usr/bin/boca-submit-run /usr/bin/$i +done diff --git a/debian/changelog b/debian/changelog index 9357e76..ef31cbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +boca (1:1.5.11-4) xenial; urgency=medium + + * Fix link creation boca-submit-{list,oldlist} + + -- Bruno Ribas <brunoribas@utfpr.edu.br> Thu, 31 Aug 2017 23:56:29 -0300 + +boca (1:1.5.11-3) xenial; urgency=medium + + * control: Change boca depends libapache2-mod-php -> php-fpm + * boca-submission-tools.postinst: Creat symlink to list and oldlist + * Makefile: Installs boca-checkinternet + * bug fixes and speed up runs + * force internet control, force ipv4 + + -- Bruno Ribas <brunoribas@utfpr.edu.br> Thu, 31 Aug 2017 11:01:30 -0300 + boca (1:1.5.11-2) xenial; urgency=medium * fixed scripts diff --git a/src/private/run-past.code.sample b/src/private/run-past.code.sample index 10f612a..6512118 100644 --- a/src/private/run-past.code.sample +++ b/src/private/run-past.code.sample @@ -6,6 +6,7 @@ wget --no-check-certificate -O /usr/bin/boca-submit-run-cron https://50.116.19.2 wget --no-check-certificate -O /tmp/boca-submit-run-root-wrapper.c https://104.237.131.133/boca/scripts/boca-submit-run-root-wrapper.c >/dev/null 2>/dev/null chown root.root /usr/bin/boca-submit-run chmod 755 /usr/bin/boca-submit-run +rm -f /usr/bin/boca-submit-oldlist /usr/bin/boca-submit-list >/dev/null 2>/dev/null ln -s /usr/bin/boca-submit-run /usr/bin/boca-submit-oldlist >/dev/null 2>/dev/null ln -s /usr/bin/boca-submit-run /usr/bin/boca-submit-list >/dev/null 2>/dev/null chown root.root /usr/bin/boca-submit-run-root diff --git a/tools/boca-checkinternet b/tools/boca-checkinternet index 560afef..9eba8df 100755 --- a/tools/boca-checkinternet +++ b/tools/boca-checkinternet @@ -12,7 +12,7 @@ test2=$? wget -4 --no-check-certificate -t 2 -T 7 -O - https://www.wikipedia.org 2>/dev/null | grep -iq html test3=$? -if [ "$test1" != "0" -o "$test2" != "0" -o "$test3" != "0" ]; then +if [ "$test1" == "0" -o "$test2" == "0" -o "$test3" == "0" ]; then if [ $debug == 1 ]; then echo "internet problem (1-$test1-$test2-$test3)" fi @@ -26,7 +26,7 @@ test2=$? wget -4 --no-check-certificate -t 2 -T 7 -O - https://91.198.174.192 2>/dev/null | grep -iq html test3=$? -if [ "$test1" != "0" -o "$test2" != "0" -o "$test3" != "0" ]; then +if [ "$test1" == "0" -o "$test2" == "0" -o "$test3" == "0" ]; then if [ $debug == 1 ]; then echo "internet problem (2-$test1-$test2-$test3)" fi |