Compare commits

..
3 Commits
Author SHA1 Message Date
kiddin9 9f4be58e93 Update upstream.yml
Merge-upstream / merge (push) Canceled after 0s
2026-09-04 14:46:53 +08:00
kiddin9 7bf0d12a49 Update upstream.yml 2026-09-04 14:40:17 +08:00
kiddin9 50d5c68bec Update fix.patch 2026-09-04 14:39:59 +08:00
2 changed files with 2 additions and 12 deletions
-10
View File
@@ -1,13 +1,3 @@
--- a/oscam/files/oscam.init
+++ b/oscam/files/oscam.init
@@ -8,5 +8,5 @@ start() {
}
stop() {
- killall oscam
+ kill `pidof oscam | sed "s/$$//g"`
}
--- a/totd/root/etc/init.d/totd --- a/totd/root/etc/init.d/totd
+++ b/totd/root/etc/init.d/totd +++ b/totd/root/etc/init.d/totd
@@ -55,5 +55,5 @@ start_service(){ @@ -55,5 +55,5 @@ start_service(){
+2 -2
View File
@@ -109,7 +109,7 @@ jobs:
( (
git_clone https://github.com/Openwrt-Passwall/openwrt-passwall && mvdir openwrt-passwall git_clone https://github.com/Openwrt-Passwall/openwrt-passwall && mvdir openwrt-passwall
git_clone https://github.com/Openwrt-Passwall/openwrt-passwall-packages && mvdir openwrt-passwall-packages git_clone https://github.com/Openwrt-Passwall/openwrt-passwall-packages && mvdir openwrt-passwall-packages
git_clone https://github.com/sbwml/luci-app-mosdns openwrt-mos && mv -n openwrt-mos/{*mosdns,v2dat} ./; rm -rf openwrt-mos git_clone https://github.com/sbwml/luci-app-mosdns openwrt-mos && mv -n openwrt-mos/{*mosdns,geo2txt} ./; rm -rf openwrt-mos
git_clone https://github.com/Lienol/openwrt-package liep && rm -rf liep/other git_clone https://github.com/Lienol/openwrt-package liep && rm -rf liep/other
git_clone https://github.com/rufengsuixing/luci-app-autoipsetadder git_clone https://github.com/rufengsuixing/luci-app-autoipsetadder
git_clone https://github.com/NateLol/luci-app-beardropper git_clone https://github.com/NateLol/luci-app-beardropper
@@ -381,7 +381,7 @@ jobs:
npx --yes degit 'dibdot/luci/applications/luci-app-shunt#luci-app-shunt-pr' luci-app-shunt npx --yes degit 'dibdot/luci/applications/luci-app-shunt#luci-app-shunt-pr' luci-app-shunt
npx --yes degit 'dibdot/packages/net/shunt#shunt-pr' shunt npx --yes degit 'dibdot/packages/net/shunt#shunt-pr' shunt
git_sparse_clone master "https://github.com/x-wrt/com.x-wrt" luci-app-macvlan luci-app-xwan git_sparse_clone master "https://github.com/x-wrt/com.x-wrt" luci-app-macvlan luci-app-xwan
git_sparse_clone master "https://github.com/obsy/packages" oscam luci-proto-wwan 3ginfo # git_sparse_clone master "https://github.com/obsy/packages" oscam luci-proto-wwan 3ginfo
git_sparse_clone istoreos-24.10 "https://github.com/jjm2473/packages" utils/dockerd git_sparse_clone istoreos-24.10 "https://github.com/jjm2473/packages" utils/dockerd
git_sparse_clone master "https://github.com/teleofis/teleofis-feed" luci packages; rm -rf luci/luci-app-{pollmydevice,simman*,strongswan,pingcontrol} luci/luci-theme-teleofis; mvdir luci; \ git_sparse_clone master "https://github.com/teleofis/teleofis-feed" luci packages; rm -rf luci/luci-app-{pollmydevice,simman*,strongswan,pingcontrol} luci/luci-theme-teleofis; mvdir luci; \
rm -rf packages/{base-files*,*lt70*,cp210x-cfg,fbfdownloader,pollmydevice,simman*,pingcontrol}; mvdir packages rm -rf packages/{base-files*,*lt70*,cp210x-cfg,fbfdownloader,pollmydevice,simman*,pingcontrol}; mvdir packages