• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得windowscocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Commit MetaInfo

Revisionef42c0ff8d5b8825f1232b3e8d2fef5e46db4e8f (tree)
Zeit2022-02-28 00:00:08
AutorSatoshi Yasuda <7m3tjz@jarl...>
CommiterSatoshi Yasuda

Log Message

modified: config.h
modified: configure
modified: debian/changelog
modified: debian/install
modified: debian/rules
modified: main.c
modified: repeater_mon.c
modified: repeater_scan.c

Ändern Zusammenfassung

Diff

--- a/config.h
+++ b/config.h
@@ -102,7 +102,7 @@
102102 #define PACKAGE_NAME "dmonitor"
103103
104104 /* Define to the full name and version of this package. */
105-#define PACKAGE_STRING "dmonitor 01.70"
105+#define PACKAGE_STRING "dmonitor 01.73"
106106
107107 /* Define to the one symbol short name of this package. */
108108 #define PACKAGE_TARNAME "dmonitor"
@@ -111,13 +111,13 @@
111111 #define PACKAGE_URL ""
112112
113113 /* Define to the version of this package. */
114-#define PACKAGE_VERSION "01.70"
114+#define PACKAGE_VERSION "01.73"
115115
116116 /* Define to 1 if you have the ANSI C header files. */
117117 #define STDC_HEADERS 1
118118
119119 /* Version number of package */
120-#define VERSION "01.70"
120+#define VERSION "01.73"
121121
122122 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
123123 <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
11 #! /bin/sh
22 # Guess values for system-dependent variables and create Makefiles.
3-# Generated by GNU Autoconf 2.69 for dmonitor 01.70.
3+# Generated by GNU Autoconf 2.69 for dmonitor 01.73.
44 #
55 # Report bugs to <7m3tjz@jarl.com>.
66 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
580580 # Identity of this package.
581581 PACKAGE_NAME='dmonitor'
582582 PACKAGE_TARNAME='dmonitor'
583-PACKAGE_VERSION='01.70'
584-PACKAGE_STRING='dmonitor 01.70'
583+PACKAGE_VERSION='01.73'
584+PACKAGE_STRING='dmonitor 01.73'
585585 PACKAGE_BUGREPORT='7m3tjz@jarl.com'
586586 PACKAGE_URL=''
587587
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
12771277 # Omit some internal or obsolete options to make the list less imposing.
12781278 # This message is too long to be a string in the A/UX 3.1 sh.
12791279 cat <<_ACEOF
1280-\`configure' configures dmonitor 01.70 to adapt to many kinds of systems.
1280+\`configure' configures dmonitor 01.73 to adapt to many kinds of systems.
12811281
12821282 Usage: $0 [OPTION]... [VAR=VALUE]...
12831283
@@ -1344,7 +1344,7 @@ fi
13441344
13451345 if test -n "$ac_init_help"; then
13461346 case $ac_init_help in
1347- short | recursive ) echo "Configuration of dmonitor 01.70:";;
1347+ short | recursive ) echo "Configuration of dmonitor 01.73:";;
13481348 esac
13491349 cat <<\_ACEOF
13501350
@@ -1435,7 +1435,7 @@ fi
14351435 test -n "$ac_init_help" && exit $ac_status
14361436 if $ac_init_version; then
14371437 cat <<\_ACEOF
1438-dmonitor configure 01.70
1438+dmonitor configure 01.73
14391439 generated by GNU Autoconf 2.69
14401440
14411441 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1912,7 +1912,7 @@ cat >config.log <<_ACEOF
19121912 This file contains any messages produced by compilers while
19131913 running configure, to aid debugging if configure makes a mistake.
19141914
1915-It was created by dmonitor $as_me 01.70, which was
1915+It was created by dmonitor $as_me 01.73, which was
19161916 generated by GNU Autoconf 2.69. Invocation command line was
19171917
19181918 $ $0 $@
@@ -2778,7 +2778,7 @@ fi
27782778
27792779 # Define the identity of the package.
27802780 PACKAGE='dmonitor'
2781- VERSION='01.70'
2781+ VERSION='01.73'
27822782
27832783
27842784 cat >>confdefs.h <<_ACEOF
@@ -5048,7 +5048,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
50485048 # report actual input values of CONFIG_FILES etc. instead of their
50495049 # values after options handling.
50505050 ac_log="
5051-This file was extended by dmonitor $as_me 01.70, which was
5051+This file was extended by dmonitor $as_me 01.73, which was
50525052 generated by GNU Autoconf 2.69. Invocation command line was
50535053
50545054 CONFIG_FILES = $CONFIG_FILES
@@ -5114,7 +5114,7 @@ _ACEOF
51145114 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
51155115 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
51165116 ac_cs_version="\\
5117-dmonitor config.status 01.70
5117+dmonitor config.status 01.73
51185118 configured by $0, generated by GNU Autoconf 2.69,
51195119 with options \\"\$ac_cs_config\\"
51205120
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
1+dmonitor (01.73) unstable; urgency=low
2+
3+ * update Closes: (#133)
4+ * changed repeater_mon and system update
5+
6+ -- Satoshi Yasuda <7m3tjz@jarl.com> Sun, 27 Feb 2022 21:00:00 +0900
7+
8+dmonitor (01.72) unstable; urgency=low
9+
10+ * update Closes: (#132)
11+ * changed Copy Right Mess.
12+
13+ -- Satoshi Yasuda <7m3tjz@jarl.com> Fri, 25 Feb 2022 12:00:00 +0900
14+
15+dmonitor (01.71) unstable; urgency=low
16+
17+ * update Closes: (#131)
18+ * changed scan time interval 2 -> 5 sec.
19+ * changed auto_repmon
20+
21+ -- Satoshi Yasuda <7m3tjz@jarl.com> Sun, 30 Jan 2022 20:30:00 +0900
22+
123 dmonitor (01.70) unstable; urgency=low
224
325 * update Closes: (#130)
--- a/debian/install
+++ b/debian/install
@@ -48,6 +48,7 @@ dmonitor_reboot1 /var/www/cgi-bin
4848 FileExpand.sh /var/www/cgi-bin
4949 FileExpand /var/www/cgi-bin
5050 lighttpd_first /var/www/cgi-bin
51+dmonitor_upd /var/www/cgi-bin
5152 debug_exec /var/www/cgi-bin
5253 log_delete /var/www/cgi-bin
5354 index.html /var/www/html
@@ -105,3 +106,5 @@ node.conf.save /var/www
105106 99-dstar.rules /var/tmp
106107 monitorix.conf /var/tmp
107108 resize_dmon.sh.org /var/tmp
109+dmonitor_update /var/tmp
110+dmonitor_update_surf /var/tmp
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,7 @@ override_dh_prep:
8787 cp /var/www/cgi-bin/FileExpand.sh debian/tmp/
8888 cp /var/www/cgi-bin/lighttpd_first debian/tmp/
8989 cp /var/www/cgi-bin/log_delete debian/tmp/
90+ cp /var/www/cgi-bin/dmonitor_upd debian/tmp/
9091 cp /var/www/dvap.conf.save debian/tmp/
9192 cp /var/www/dvmega.conf.save debian/tmp/
9293 cp /var/www/node.conf.save debian/tmp/
@@ -117,3 +118,5 @@ override_dh_prep:
117118 cp /usr/share/javascript/jquery/jquery.cookie.js debian/tmp/
118119 cp /etc/monitorix/monitorix.conf debian/tmp/
119120 cp /usr/local/bin/resize_dmon.sh.org debian/tmp/
121+ cp /usr/local/bin/dmonitor_update debian/tmp/
122+ cp /usr/local/bin/dmonitor_update_surf debian/tmp/
--- a/main.c
+++ b/main.c
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
257257 inet_recv_time.tv_sec = 0;
258258 inet_recv_time.tv_usec = 0;
259259
260- add_time.tv_sec = 2;
260+ add_time.tv_sec = 5;
261261 add_time.tv_usec = 0;
262262
263263 rig_send_time_20mSec.tv_sec = 0;
--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -44,7 +44,7 @@ int ja_check (unsigned char callsign[])
4444 fprintf (html_fd, "<font color=red><b>接続コールサインが日本のコールサインでないか<br>\n");
4545 fprintf (html_fd, "最初に空白がある等、設定が間違っています。</b></font>\n");
4646 fprintf (html_fd, "</table>\n");
47- fprintf (html_fd, "(C) Copyright 2021 JARL D-STAR Committee</center></BODY></HTML>\n");
47+ fprintf (html_fd, "(C) Copyright 2022 JARL D-STAR Committee</center></BODY></HTML>\n");
4848 fprintf (html_fd, "\n");
4949 fclose (html_fd);
5050 memset (temp, 0x00, sizeof(temp));
@@ -490,13 +490,14 @@ void main(int argc, char** argv)
490490 fprintf (html_fd, "アップデートして下さい。</b></font>\n");
491491 fprintf (html_active_fd, "<font color=red><b>使用プログラムのバーションが最新ではありません。<br>\n");
492492 fprintf (html_active_fd, "アップデートして下さい。</b></font>\n");
493- fprintf (html_fd, "<br><br><a href=\"./update.html\" target=\"_blank\">アップデートの手順</a>\n");
493+ fprintf (html_fd, "<br><br><a href=\"/cgi-bin/dmonitor_upd\">アップデートをすぐ行う。</a><br>(再起動が行われ、その後アップデートが行われます。)\n");
494+ fprintf (html_fd, "<br><br>\n");
494495 fprintf (html_fd, "</table>\n");
495- fprintf (html_fd, "(C) Copyright 2021 JARL D-STAR Committee</center></BODY></HTML>\n");
496+ fprintf (html_fd, "(C) Copyright 2022 JARL D-STAR Committee</center></BODY></HTML>\n");
496497 fprintf (html_fd, "\n");
497498 fclose (html_fd);
498- fprintf (html_active_fd, "<br><br><a href=\"./update.html\" target=\"_blank\">アップデートの手順</a>\n");
499499 close (sd);
500+ fclose (conn_fd);
500501 goto end;
501502 }
502503 else if (!memcmp (&buff[k], "Content-Length:", 15))
@@ -579,7 +580,7 @@ next:
579580 if (col) fprintf (html_fd, "</tr>");
580581
581582 fprintf (html_fd, "</table>\n");
582- fprintf (html_fd, "(C) Copyright 2021 JARL D-STAR Committee (%d repeaters)</center></BODY></HTML>\n", repeater_cnt);
583+ fprintf (html_fd, "(C) Copyright 2022 JARL D-STAR Committee (%d repeaters)</center></BODY></HTML>\n", repeater_cnt);
583584 fprintf (html_fd, "\n");
584585 fclose (html_fd);
585586
--- a/repeater_scan.c
+++ b/repeater_scan.c
@@ -66,7 +66,7 @@ int ja_check (unsigned char callsign[])
6666 fprintf (AccFile, "<font color=red><b>接続コールサインが日本のコールサインでないか<br>\n");
6767 fprintf (AccFile, "最初に空白がある等、設定が間違っています。</b></font>\n");
6868 fprintf (AccFile, "</table>\n");
69- fprintf (AccFile, "(C) Copyright 2021 JARL D-STAR Committee</center></BODY></HTML>\n");
69+ fprintf (AccFile, "(C) Copyright 2022 JARL D-STAR Committee</center></BODY></HTML>\n");
7070 fprintf (AccFile, "\n");
7171 fclose (AccFile);
7272 sprintf (temp, "mv -f %s %s", SCAN_HTML_TEMP, SCAN_HTML);
@@ -333,7 +333,7 @@ int main(int argc, char** argv)
333333 fprintf (AccFile, "アップデートして下さい。</b></font>\n");
334334 fprintf (AccFile, "<br><br><a href=\"./update.html\" target=\"_blank\">アップデートの手順</a>\n");
335335 fprintf (AccFile, "</table>\n");
336- fprintf (AccFile, "(C) Copyright 2021 JARL D-STAR Committee</center></BODY></HTML>\n");
336+ fprintf (AccFile, "(C) Copyright 2022 JARL D-STAR Committee</center></BODY></HTML>\n");
337337 fprintf (AccFile, "\n");
338338 fclose (AccFile);
339339 close (sd);
@@ -435,7 +435,7 @@ next:
435435 if ((col % COL) == 0) fprintf (AccFile, "</tr>");
436436 }
437437 fprintf (AccFile, "</table>\n");
438- fprintf (AccFile, "<(C) Copyright 2021 JARL D-STAR Committee</center></BODY></HTML>\n");
438+ fprintf (AccFile, "<(C) Copyright 2022 JARL D-STAR Committee</center></BODY></HTML>\n");
439439 fprintf (AccFile, "\n");
440440 fclose (AccFile);
441441 memset (temp, 0x00, sizeof(temp));