From 96c459e5e1420acd77b6a6fccec35485994646a8 Mon Sep 17 00:00:00 2001 From: Zhang Jingqiang Date: Mon, 20 Jan 2025 10:37:46 +0800 Subject: [PATCH 1/2] update packages --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7e75579..7e304a9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.9" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "shlex", ] @@ -2451,9 +2451,9 @@ checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "is_terminal_polyfill" @@ -3241,9 +3241,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" From 1b0742490b9bf8c7391b802e4bba24b238d3d718 Mon Sep 17 00:00:00 2001 From: Zhang Jingqiang Date: Mon, 20 Jan 2025 10:40:23 +0800 Subject: [PATCH 2/2] always use latest systemd service file in deb package --- g3bench/debian/compat | 2 +- g3fcgen/debian/compat | 2 +- g3iploc/debian/compat | 2 +- g3keymess/debian/compat | 2 +- g3keymess/debian/g3keymess.install | 1 - g3keymess/debian/g3keymess@.service | 21 +++++++++++++++++++++ g3keymess/debian/rules | 2 -- g3mkcert/debian/compat | 2 +- g3proxy/debian/compat | 2 +- g3proxy/debian/g3proxy.install | 1 - g3proxy/debian/g3proxy@.service | 22 ++++++++++++++++++++++ g3proxy/debian/rules | 2 -- g3tiles/debian/compat | 2 +- g3tiles/debian/g3tiles.install | 1 - g3tiles/debian/g3tiles@.service | 22 ++++++++++++++++++++++ g3tiles/debian/rules | 2 -- 16 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 g3keymess/debian/g3keymess@.service create mode 100644 g3proxy/debian/g3proxy@.service create mode 100644 g3tiles/debian/g3tiles@.service diff --git a/g3bench/debian/compat b/g3bench/debian/compat index f599e28b..48082f72 100644 --- a/g3bench/debian/compat +++ b/g3bench/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3fcgen/debian/compat b/g3fcgen/debian/compat index f599e28b..48082f72 100644 --- a/g3fcgen/debian/compat +++ b/g3fcgen/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3iploc/debian/compat b/g3iploc/debian/compat index f599e28b..48082f72 100644 --- a/g3iploc/debian/compat +++ b/g3iploc/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3keymess/debian/compat b/g3keymess/debian/compat index f599e28b..48082f72 100644 --- a/g3keymess/debian/compat +++ b/g3keymess/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3keymess/debian/g3keymess.install b/g3keymess/debian/g3keymess.install index c930ad62..5dcd21b0 100644 --- a/g3keymess/debian/g3keymess.install +++ b/g3keymess/debian/g3keymess.install @@ -1,3 +1,2 @@ usr/bin/g3keymess usr/bin/g3keymess-ctl -lib/systemd/system/ diff --git a/g3keymess/debian/g3keymess@.service b/g3keymess/debian/g3keymess@.service new file mode 100644 index 00000000..d865b20f --- /dev/null +++ b/g3keymess/debian/g3keymess@.service @@ -0,0 +1,21 @@ +[Unit] +Description=G3 Keyless Server %i +After=syslog.target network-online.target +Wants=network-online.target + +[Service] +Type=simple +RuntimeDirectory=g3keymess +RuntimeDirectoryPreserve=yes +EnvironmentFile=-/etc/g3keymess/%i/env +ExecStart=/usr/bin/g3keymess -c /etc/g3keymess/%i/ --control-dir $RUNTIME_DIRECTORY -s -G %i +ExecReload=/bin/kill -HUP $MAINPID +ExecStop=-/usr/bin/g3keymess-ctl --control-dir $RUNTIME_DIRECTORY -G %i -p $MAINPID offline +KillMode=none +Restart=on-success +SuccessExitStatus=SIGQUIT +TimeoutStartSec=10 +LimitNOFILE=10485760 + +[Install] +WantedBy=multi-user.target diff --git a/g3keymess/debian/rules b/g3keymess/debian/rules index 769c8125..de001596 100755 --- a/g3keymess/debian/rules +++ b/g3keymess/debian/rules @@ -17,13 +17,11 @@ override_dh_auto_build: cargo build --frozen --offline --profile $(BUILD_PROFILE) \ --no-default-features --features $(SSL_FEATURE), \ --package g3keymess --package g3keymess-ctl - sh $(PACKAGE_NAME)/service/generate_systemd.sh override_dh_auto_install: dh_auto_install install -m 755 -D target/$(BUILD_PROFILE)/g3keymess debian/tmp/usr/bin/g3keymess install -m 755 -D target/$(BUILD_PROFILE)/g3keymess-ctl debian/tmp/usr/bin/g3keymess-ctl - install -m 644 -D $(PACKAGE_NAME)/service/g3keymess@.service debian/tmp/lib/systemd/system/g3keymess@.service override_dh_installchangelogs: dh_installchangelogs $(PACKAGE_NAME)/CHANGELOG diff --git a/g3mkcert/debian/compat b/g3mkcert/debian/compat index f599e28b..48082f72 100644 --- a/g3mkcert/debian/compat +++ b/g3mkcert/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3proxy/debian/compat b/g3proxy/debian/compat index f599e28b..48082f72 100644 --- a/g3proxy/debian/compat +++ b/g3proxy/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3proxy/debian/g3proxy.install b/g3proxy/debian/g3proxy.install index 83f20d32..e1a189c2 100644 --- a/g3proxy/debian/g3proxy.install +++ b/g3proxy/debian/g3proxy.install @@ -2,4 +2,3 @@ usr/bin/g3proxy usr/bin/g3proxy-ctl usr/bin/g3proxy-ftp usr/bin/g3proxy-lua -lib/systemd/system/ diff --git a/g3proxy/debian/g3proxy@.service b/g3proxy/debian/g3proxy@.service new file mode 100644 index 00000000..a502b079 --- /dev/null +++ b/g3proxy/debian/g3proxy@.service @@ -0,0 +1,22 @@ +[Unit] +Description=G3 Proxy %i +After=syslog.target network-online.target +Wants=network-online.target + +[Service] +Type=simple +RuntimeDirectory=g3proxy +RuntimeDirectoryPreserve=yes +EnvironmentFile=-/etc/g3proxy/%i/env +ExecStart=/usr/bin/g3proxy -c /etc/g3proxy/%i/ --control-dir $RUNTIME_DIRECTORY -s -G %i +ExecReload=/bin/kill -HUP $MAINPID +ExecStop=/usr/bin/g3proxy-ctl --control-dir $RUNTIME_DIRECTORY -G %i -p $MAINPID offline +KillMode=none +Restart=on-failure +SuccessExitStatus=SIGQUIT +RestartPreventExitStatus=255 +TimeoutStartSec=10 +LimitNOFILE=10485760 + +[Install] +WantedBy=multi-user.target diff --git a/g3proxy/debian/rules b/g3proxy/debian/rules index ddf12073..d9d927e3 100755 --- a/g3proxy/debian/rules +++ b/g3proxy/debian/rules @@ -20,7 +20,6 @@ override_dh_auto_build: --no-default-features --features $(LUA_FEATURE),$(SSL_FEATURE),rustls-ring,quic,$(CARES_FEATURE),hickory \ --package g3proxy --package g3proxy-ctl --package g3proxy-lua cargo build --frozen --profile $(BUILD_PROFILE) --package g3proxy-ftp - sh $(PACKAGE_NAME)/service/generate_systemd.sh override_dh_auto_install: dh_auto_install @@ -28,7 +27,6 @@ override_dh_auto_install: install -m 755 -D target/$(BUILD_PROFILE)/g3proxy-ctl debian/tmp/usr/bin/g3proxy-ctl install -m 755 -D target/$(BUILD_PROFILE)/g3proxy-ftp debian/tmp/usr/bin/g3proxy-ftp install -m 755 -D target/$(BUILD_PROFILE)/g3proxy-lua debian/tmp/usr/bin/g3proxy-lua - install -m 644 -D $(PACKAGE_NAME)/service/g3proxy@.service debian/tmp/lib/systemd/system/g3proxy@.service override_dh_installchangelogs: dh_installchangelogs $(PACKAGE_NAME)/CHANGELOG diff --git a/g3tiles/debian/compat b/g3tiles/debian/compat index f599e28b..48082f72 100644 --- a/g3tiles/debian/compat +++ b/g3tiles/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/g3tiles/debian/g3tiles.install b/g3tiles/debian/g3tiles.install index beed23ef..12b38a14 100644 --- a/g3tiles/debian/g3tiles.install +++ b/g3tiles/debian/g3tiles.install @@ -1,3 +1,2 @@ usr/bin/g3tiles usr/bin/g3tiles-ctl -lib/systemd/system/ diff --git a/g3tiles/debian/g3tiles@.service b/g3tiles/debian/g3tiles@.service new file mode 100644 index 00000000..b4598607 --- /dev/null +++ b/g3tiles/debian/g3tiles@.service @@ -0,0 +1,22 @@ +[Unit] +Description=G3 Reverse Proxy %i +After=syslog.target network-online.target +Wants=network-online.target + +[Service] +Type=simple +RuntimeDirectory=g3tiles +RuntimeDirectoryPreserve=yes +EnvironmentFile=-/etc/g3tiles/%i/env +ExecStart=/usr/bin/g3tiles -c /etc/g3tiles/%i/ --control-dir $RUNTIME_DIRECTORY -s -G %i +ExecReload=/bin/kill -HUP $MAINPID +ExecStop=/usr/bin/g3tiles-ctl --control-dir $RUNTIME_DIRECTORY -G %i -p $MAINPID offline +KillMode=none +Restart=on-failure +SuccessExitStatus=SIGQUIT +RestartPreventExitStatus=255 +TimeoutStartSec=10 +LimitNOFILE=10485760 + +[Install] +WantedBy=multi-user.target diff --git a/g3tiles/debian/rules b/g3tiles/debian/rules index 1bb9408f..da8312f6 100755 --- a/g3tiles/debian/rules +++ b/g3tiles/debian/rules @@ -17,13 +17,11 @@ override_dh_auto_build: cargo build --frozen --offline --profile $(BUILD_PROFILE) \ --no-default-features --features $(SSL_FEATURE),rustls-ring,quic \ --package g3tiles --package g3tiles-ctl - sh $(PACKAGE_NAME)/service/generate_systemd.sh override_dh_auto_install: dh_auto_install install -m 755 -D target/$(BUILD_PROFILE)/g3tiles debian/tmp/usr/bin/g3tiles install -m 755 -D target/$(BUILD_PROFILE)/g3tiles-ctl debian/tmp/usr/bin/g3tiles-ctl - install -m 644 -D $(PACKAGE_NAME)/service/g3tiles@.service debian/tmp/lib/systemd/system/g3tiles@.service override_dh_installchangelogs: dh_installchangelogs $(PACKAGE_NAME)/CHANGELOG