Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre release 0.4.1x #341

Merged
merged 92 commits into from
Feb 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
c82ff43
[New] Wi-Fi Recovery
alienatedsec Aug 20, 2023
4d70c2b
[New] Setting Merge
alienatedsec Aug 24, 2023
25db09f
[New] Backup before Wi-Fi recover
alienatedsec Aug 24, 2023
9a88716
Restore feature to edit config files
roleoroleo Aug 25, 2023
5c0e1f6
Add flag to decrease binary size
roleoroleo Aug 25, 2023
381b840
Remove old patch
roleoroleo Aug 25, 2023
f5e97ce
Decrease RTP packet length
roleoroleo Aug 25, 2023
9897afc
Improve sync/async read
roleoroleo Aug 25, 2023
d29169e
Update gitignore
roleoroleo Aug 25, 2023
70a78bd
New features: disable, force low and already running
roleoroleo Aug 25, 2023
d19971d
Remove unused settings from config files
roleoroleo Aug 25, 2023
c7034e2
Add options to disable snapshot and force low res
roleoroleo Aug 25, 2023
fcb3bc3
Remove unused mqtt options
roleoroleo Aug 25, 2023
2dc4cfa
Fix and improve h264grabber
roleoroleo Aug 26, 2023
6ce47e2
Fix system.conf parameters
roleoroleo Aug 26, 2023
a309b2a
Remove ai_human_detection and restore baby_crying
roleoroleo Aug 26, 2023
d26f0fa
Merge branch 'pre-release-0.4.1x' into roleo_testing
alienatedsec Aug 26, 2023
6740df0
Merge pull request #289 from alienatedsec/roleo_testing
alienatedsec Aug 26, 2023
878720f
[Pre-Release] 0.4.1a
alienatedsec Aug 26, 2023
ee0da9d
Change size of fifo queues
roleoroleo Sep 5, 2023
66030f5
Restore audio stream ch0_2.h264
roleoroleo Sep 5, 2023
cf13502
Add native api to take low res snapshot
roleoroleo Sep 5, 2023
15e07ff
Remove option: watermark for onvif snapshot
roleoroleo Sep 5, 2023
c821423
Change label for "Force low res snapshot"
roleoroleo Sep 5, 2023
8262a93
Merge branch 'roleo_testing' of https://github.com/alienatedsec/yi-ha…
roleoroleo Sep 5, 2023
63213ca
[Change] launch.sh optimised to kill gently
alienatedsec Sep 16, 2023
26009c1
[Change] Tuning launch.sh
alienatedsec Sep 22, 2023
db856f3
[New] Compile specific module - thanks @thelittlefireman
alienatedsec Sep 23, 2023
54b1e65
Improve RTSP server
roleoroleo Sep 28, 2023
e6ebbce
Minor fixes
roleoroleo Sep 28, 2023
9c4fff6
Remove unused options when empty password
roleoroleo Sep 28, 2023
434db6d
Add mqttv4 to watchdog
roleoroleo Sep 28, 2023
3cedddd
Add "if supported" in camera settings page
roleoroleo Sep 28, 2023
b305a15
Add support for native time osd
roleoroleo Sep 29, 2023
e171cc3
Merge pull request #299 from alienatedsec/roleo_testing
alienatedsec Sep 30, 2023
91251dc
[Pre-Release] 0.4.1b
alienatedsec Oct 2, 2023
20fb8bd
[Upgrade] wpa_supplicant v2.10 & OpenSSL 1.1.1w
alienatedsec Nov 20, 2023
ff800a1
[Fix] OpenSSL src
alienatedsec Nov 20, 2023
050b5ce
[Clean] wpa_supplicant clearance
alienatedsec Nov 20, 2023
d3321c9
[Fix] Install typo
alienatedsec Nov 20, 2023
3af63bc
[Fix] Install typo part 2
alienatedsec Nov 20, 2023
22a3387
[Pre-Release] 0.4.1c
alienatedsec Nov 20, 2023
dee720d
[Fix] wpa_supplicant backup process
alienatedsec Nov 21, 2023
b55c5ca
[-] Removed duplicated snapshot settings - Thanks @MichlW
alienatedsec Nov 21, 2023
f990436
[Fix] cloudAPI execution and app pairing
alienatedsec Nov 22, 2023
f282f6e
[+] Update cloudAPI if necessary
alienatedsec Nov 22, 2023
4b7da28
[Pre-Release] 0.4.1d
alienatedsec Nov 22, 2023
536af13
[Amend] Busybox
alienatedsec Jan 23, 2024
457be5c
[+] Busybox 1.36.1
alienatedsec Jan 23, 2024
405862e
Add ptz functions to ipc_cmd
roleoroleo Jan 24, 2024
599e224
Move preset.sh code to ptz_presets.sh
roleoroleo Jan 25, 2024
516bd32
Add add/delete ptz presets
roleoroleo Jan 25, 2024
fe3cb7d
Add ipc2file: create a tmp file when an event is triggered
roleoroleo Jan 25, 2024
39f67ce
Add configuration file editing
roleoroleo Jan 25, 2024
6a15142
Add new parameters
roleoroleo Jan 25, 2024
2fb0fbe
Use generic command for ipc_cmd
roleoroleo Jan 25, 2024
677e5e3
Add onvif_simple_server submodule
roleoroleo Jan 25, 2024
f42d514
Patch httpd to run onvif as a cgi
roleoroleo Jan 25, 2024
e258274
Remove onvif_srvd and add onvif_simple_server sharing port 80 with httpd
roleoroleo Jan 26, 2024
053e47f
Update .gitignore
roleoroleo Jan 26, 2024
e5062db
Remove wsdd submodule
roleoroleo Jan 26, 2024
06e5c1f
Fix installation path
roleoroleo Jan 26, 2024
7021fa0
Replace symlinks with .sh
roleoroleo Jan 26, 2024
867371a
Add -t parameter to imggrabber
roleoroleo Jan 26, 2024
30ea52d
fix: WARNING in HA => MQTT entity name starts with the device name in…
Minims Jan 26, 2024
afb3f0c
Update onvif_simple_server to the last commit
roleoroleo Jan 27, 2024
29f8cdb
fix: sleep to give ipc_multiplexer time
fidesachates Jan 28, 2024
dc188fb
[+] Busybox clearance, Curl fix, and wpa_supplicant integration
alienatedsec Jan 29, 2024
e17aee7
[~] Fix wpa_supplicant path & baseline pack
alienatedsec Jan 29, 2024
40b9ace
Enable packing of rootfs and home
roleoroleo Jan 31, 2024
b96d835
Remove busybox submodule
roleoroleo Jan 31, 2024
4ae48df
Add busybox 1.36.1
roleoroleo Jan 31, 2024
1ecf7be
Minor fixes
roleoroleo Jan 31, 2024
7b2a9ba
Fix syntax error in system_init.sh
roleoroleo Jan 31, 2024
bd032dd
[+] Merge conflicts resolved
alienatedsec Jan 31, 2024
da803b6
[+] Merge conflict commits part 2
alienatedsec Jan 31, 2024
b8eab19
[~] Update to init.busybox
alienatedsec Jan 31, 2024
7158833
Merge pull request #330 from alienatedsec/roleo_test2
alienatedsec Jan 31, 2024
2d2a0f5
[Fix] libfuse change
alienatedsec Jan 31, 2024
ffa50c4
[-] Remove additional WPA content
alienatedsec Jan 31, 2024
73a1beb
Add is_running option to onvif_simple_server.conf
roleoroleo Feb 1, 2024
cda71eb
Minor fixes to cloudAPI_fake
roleoroleo Feb 1, 2024
9d4ef48
Merge pull request #331 from alienatedsec/roleo_test2
alienatedsec Feb 3, 2024
ce95a00
Merge pull request #327 from Minims/mqtt
alienatedsec Feb 3, 2024
ab15cc5
Merge branch 'pre-release-0.4.1x' into patch-2
alienatedsec Feb 4, 2024
b279d35
Merge pull request #328 from fidesachates/patch-2
alienatedsec Feb 4, 2024
755b656
[Pre-Release] 0.4.1[e] Release Candidate
alienatedsec Feb 4, 2024
d736440
[~] Update Readme for 0.4.1 release
alienatedsec Feb 4, 2024
590ebe7
[Fix] Attempt for #334 and #336 thanks @lebestnoob
alienatedsec Feb 10, 2024
ca25da4
[Pre-Release] 0.4.1f and delete compressed files fix
alienatedsec Feb 10, 2024
8737a36
[Pre-Release] 0.4.1g - Minor fixes and readded system.sh upgrade func…
alienatedsec Feb 10, 2024
8d13a5c
[Fix] wpa_supplicant baseline upgrade for yi_home and yi_dome
alienatedsec Feb 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
path = src/uClibc/uClibc
url = https://github.com/kraj/uClibc.git
ignore = dirty
[submodule "src/busybox/busybox"]
path = src/busybox/busybox
url = https://github.com/mirror/busybox.git
ignore = dirty
[submodule "src/proxychains-ng/proxychains-ng"]
path = src/proxychains-ng/proxychains-ng
url = https://github.com/rofl0r/proxychains-ng.git
Expand All @@ -26,10 +22,6 @@
path = src/mosquitto/mosquitto
url = https://github.com/eclipse/mosquitto.git
ignore = dirty
[submodule "src/wsdd/wsdd"]
path = src/wsdd/wsdd
url = https://github.com/KoynovStas/wsdd.git
ignore = dirty
[submodule "src/libfuse/libfuse"]
path = src/libfuse/libfuse
url = https://github.com/libfuse/libfuse.git
Expand All @@ -42,3 +34,6 @@
path = src/curl/curl
url = https://github.com/curl/curl
ignore = dirty
[submodule "src/onvif_simple_server/onvif_simple_server"]
path = src/onvif_simple_server/onvif_simple_server
url = https://github.com/roleoroleo/onvif_simple_server
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
The answer is simple: missing updates, RTSP, and not based on the latest stock firmware (which features improvements and new cool stuff).
Besides, there were no updates to `yi-hack-v4`, and I am against that RTSP licensing model. I have contributed enough and will continue my work separately.

I am slowly releasing beta versions, and I can see lots of downloads, testing and contributions. A big thank you to the community.
I am slowly working on pre-release versions, and I can see lots of downloads, testing and contributions. A big thank you to the community.

## Table of Contents

Expand Down Expand Up @@ -109,7 +109,7 @@ Alternative way:

</p></details>

3. Get the correct firmware files for your camera from the latest baseline release link: https://github.com/alienatedsec/yi-hack-v5/releases/tag/0.3.8
3. Get the correct firmware files for your camera from the latest baseline release link: https://github.com/alienatedsec/yi-hack-v5/releases/tag/0.4.1

| Camera | rootfs partition | home partition | Remarks |
| --- | --- | --- | --- |
Expand Down Expand Up @@ -138,7 +138,7 @@ Depending upon your network setup, accessing the web interface with the hostname

This can be done from the App. Please open the app, and go to the Camera Settings --> Network Info --> IP Address.

Access the web interface by entering the IP address of the camera in a web browser. e.g. `http://192.168.1.5:8080`
Access the web interface by entering the IP address of the camera in a web browser. e.g. `http://192.168.1.5`

**_IMPORTANT: If you have multiple cameras. It is important to configure each camera with a unique hostname. Otherwise, the web interface will only be accessible by IP address._**

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.4.1g
15 changes: 14 additions & 1 deletion scripts/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ compile_module()
printf "MOD_COMPILE: %s\n" "$MOD_COMPILE"
printf "MOD_INSTALL: %s\n" "$MOD_INSTALL"

echo "Compile $MOD_NAME"
cd "$MOD_DIR"

if [ ! -f $MOD_INIT ]; then
Expand Down Expand Up @@ -89,10 +90,22 @@ mkdir -p "$(get_script_dir)/../build/home"
mkdir -p "$(get_script_dir)/../build/rootfs"

SRC_DIR=$(get_script_dir)/../src
SELECTED_MODULE=$1
if [ -n ${SELECTED_MODULE} ]; then
echo "SELECTED_MODULE: $SELECTED_MODULE"
fi

for SUB_DIR in $SRC_DIR/* ; do
if [ -d ${SUB_DIR} ]; then # Will not run if no directories are available
compile_module $(normalize_path "$SUB_DIR") || exit 1
if [ -n ${SELECTED_MODULE} ]; then
if [[ $SUB_DIR == *"$SELECTED_MODULE"* ]]; then
compile_module $(normalize_path "$SUB_DIR") || exit 1
else
echo "Skip $SUB_DIR"
fi
else
compile_module $(normalize_path "$SUB_DIR") || exit 1
fi
fi
done

Expand Down
19 changes: 14 additions & 5 deletions scripts/pack_fw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# This file is part of yi-hack-v5 (https://github.com/alienatedsec/yi-hack-v5).
# Copyright (c) 2018-2019 Davide Maggioni - v4 specific
# Copyright (c) 2021-2023 alienatedsec - v5 specific
# Copyright (c) 2021-2024 alienatedsec - v5 specific
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -206,6 +206,10 @@ compress_file "$TMP_DIR/home/app" cloudAPI
compress_file "$TMP_DIR/home/app" oss
compress_file "$TMP_DIR/home/app" p2p_tnp
compress_file "$TMP_DIR/home/app" rmm
compress_file "$TMP_DIR/home/base/tools" wpa_supplicant
compress_file "$TMP_DIR/home/base/tools" wpa_passphrase
compress_file "$TMP_DIR/home/base/tools" wpa_cli
compress_file "$TMP_DIR/home/lib" libcrypto.so.1.1

# Compress the yi-hack-v5 folder
printf "Compressing yi-hack-v5... "
Expand All @@ -223,18 +227,24 @@ rm $TMP_DIR/home/yi-hack-v5/yi-hack-v5.7z
echo "Deleteing of yi-hack-v5.7z - done!"

# Delete all the compressed files except system_init.sh and yi-hack-v5.7z
#find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
find $TMP_DIR/home/yi-hack-v5/script/ -maxdepth 0 ! -name 'system_init.sh' -type f -exec rm -f {} +
find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! \( -name 'script' -o -name 'etc' -o -name 'lib' \) -exec rm -rf {} \;
find $TMP_DIR/home/yi-hack-v5/lib/ -type f ! -name 'ipc_multiplex.so' -exec rm -f {} \;
find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type f ! -name 'version' -exec rm {} +

# Delete the old wpa_supplicant upgrade file from the image so it wont override the release version
find $TMP_DIR/home/app/ -type f -name 'wpa_supplicant' -exec rm -f {} \;

printf "done!\n\n"

# home
# Disabled after 0.3.8
#pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR

# rootfs
# Disabled after 0.3.8
#pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR

# pack files for release
pack_files $WORK_DIR $CAMERA_NAME $VERSION_ID
Expand All @@ -247,4 +257,3 @@ printf "done!\n\n"
echo "------------------------------------------------------------------------"
echo " Finished!"
echo "------------------------------------------------------------------------"

Loading