Skip to content
Snippets Groups Projects
Commit 0bd3c519 authored by alexandr.kravchenko's avatar alexandr.kravchenko
Browse files

replaced ultrapad junk with proper files. Removed android stub

parent 73964cb3
No related branches found
No related tags found
3 merge requests!71Support 2649,!70Support 2649,!69Support 2649
Showing
with 110 additions and 431 deletions
debian 0 → 120000
prod_build/linux/debian/essentials
\ No newline at end of file
#!/bin/bash -e
. /usr/share/debconf/confmodule
DAP_CHAINS_NAME="cellframe"
DAP_APP_NAME="$DAP_CHAINS_NAME-node"
DAP_PREFIX="/opt/$DAP_APP_NAME"
DAP_CFG_TPL="$DAP_PREFIX/share/configs/$DAP_APP_NAME.cfg.tpl"
# Store write config to new if present smth
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
# Check profile.d symlink
[ -e "/etc/profile.d/$DAP_APP_NAME.sh" ] && ln -sf $DAP_PREFIX/share/profile.d/$DAP_APP_NAME.sh /etc/profile.d/$DAP_APP_NAME.sh
# Init node config
if [ -e "$DAP_CFG" ]; then
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg.dpkg-new"
else
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
fi
cat $DAP_CFG_TPL > $DAP_CFG || true
db_get cellframe-node/debug_mode || true
sed -i "s/{DEBUG_MODE}/$RET/" $DAP_CFG || true
db_get cellframe-node/auto_online || true
sed -i "s/{AUTO_ONLINE}/$RET/" $DAP_CFG || true
db_get cellframe-node/debug_stream_headers || true
sed -i "s/{DEBUG_STREAM_HEADERS}/$RET/" $DAP_CFG || true
db_get cellframe-node/server_enabled || true
sed -i "s/{SERVER_ENABLED}/$RET/" $DAP_CFG || true
db_get cellframe-node/server_port || true
sed -i "s/{SERVER_PORT}/$RET/" $DAP_CFG || true
db_get cellframe-node/server_addr || true
sed -i "s/{SERVER_ADDR}/$RET/" $DAP_CFG || true
# Init kelvin-testnet
NET_NAME="kelvin-testnet"
db_get cellframe-node/kelvin_testnet_enable || true
if [ "$RET"="true" ]; then
DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
DAP_NET_CFG=""
if [ -e "$DAP_CFG_NET" ]; then
DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
else
DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
fi
cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
db_get cellframe-node/kelvin_testnet_node_type || true
NODE_TYPE=$RET
sed -i "s/{NODE_TYPE}/$NODE_TYPE/" $DAP_NET_CFG || true
fi
mkdir -p $DAP_PREFIX/var/log || true
cat /etc/passwd| grep cellframe-node || adduser --system --no-create-home --group --home /opt/cellframe-node cellframe-node
echo "[*] Check /etc/systemd/system/$DAP_APP_NAME.service file..."
if [ -f /etc/systemd/system/$DAP_APP_NAME.service ]; then
echo "[*] Restarting $DAP_APP_NAME to implement changes"
systemctl --system stop $DAP_APP_NAME >> /dev/null|| true
systemctl daemon-reload || true
systemctl --system start $DAP_APP_NAME || true
else
echo "[!] Installing $DAP_APP_NAME as systemd service (haven't found /etc/systemd/system/$DAP_APP_NAME.service)"
ln -sf $DAP_PREFIX/share/$DAP_APP_NAME.service /etc/systemd/system/$DAP_APP_NAME.service || true
systemctl --system enable $DAP_PREFIX/share/$DAP_APP_NAME.service || true
# systemctl --system start $DAP_APP_NAME
echo "[ ] Execute 'systemctl start $DAP_APP_NAME' to start $DAP_APP_NAME service"
#USERMAN=`users | awk '{print $1}'`
adduser --system --no-create-home --group --home /opt/cellframe-node cellframe-node || true
#usermod -aG $DAP_CHAINS_NAME `users | awk '{print $1}'`
for username in $(cat /etc/passwd | grep "/home" | cut -d ':' -f1); do
usermod -aG cellframe-node $username
done
mkdir -p $DAP_PREFIX/var/{run,lib/ca,lib/wallet,lib/global_db}
touch $DAP_PREFIX/var/run/cellframe-node.pid
#chown -R $USERMAN:$USERMAN $DAP_PREFIX
for filename in $(find $DAP_PREFIX); do
if [ -d $filename ]; then
chmod 0775 $filename
else
chmod 0664 $filename
fi
done
chmod 0774 $DAP_PREFIX/bin/*
echo "[*] Done"
fi
#!/usr/bin/make -f
override_dh_fixperms:
dh_fixperms -X/opt/cellframe-node
override_dh_auto_install:
dh_auto_install -- prefix=/opt/cellframe-node
%:
# dh $@ --with=systemd
dh $@
papizh-key/creds.conf
\ No newline at end of file
export ALIAS=pconst
export PASS=B0yc3-K0dd
File deleted
papizh-key/release-key.jks
\ No newline at end of file
#!/bin/bash
. ./prod_build/general/pre-build.sh
export_variables "./prod_build/android/conf/*"
#read_conf.
#src_path=$workdir/resources/SAP/sapnet-client
#WORK_PATH=$wd/resources/SAP/sapnet-client-build
SRC_DIR=$(pwd)
RES_PATH=${SRC_DIR}/$RES_PATH
exitcode=0
echo "DexGuard tuning"
[ -f "$RES_PATH/gradle.properties" ] || { echo "systemProp.dexguard.license=/usr/local/etc/dexguard-license.txt" >> $RES_PATH/gradle.properties && echo "enableDexGuard=true" >> $RES_PATH/gradle.properties ; }
sed -i '/flatDir/s/'"'"'.*'"'"' }/'"'"'\/opt\/DexGuard\/DexGuard-8.2.12\/lib'"'"' }/' $RES_PATH/build.gradle
mkdir -p $SRC_DIR/build/apk
BRAND=`cat *.pro | grep "BRAND " | rev | cut -d " " -f1 | rev`
echo "extracting version"
VERSION=$(extract_version_number)
echo "version number is $VERSION"
. prod_build/android/essentials/key/creds.conf
mkdir -p $WORK_PATH
cd $WORK_PATH
rm -rf *
APK_PATH=android/build/outputs/apk
echo "arch-versions are $ARCH_VERSIONS"
IFS=" "
for arch in $ARCH_VERSIONS; do
mkdir -p $arch
cd $arch
export QT_SELECT=$arch
ANDRQT_HOME=/usr/lib/crossdev/android-$arch/*/bin
$ANDRQT_HOME/qmake -r -spec android-g++ CONFIG+=release CONFIG+=qml_release BRAND=$BRAND BRAND_TARGET=$BRAND $SRC_DIR/*.pro && \
$ANDROID_NDK_HOME/prebuilt/$NDKHOST/bin/make -j3 && \
$ANDROID_NDK_HOME/prebuilt/$NDKHOST/bin/make install INSTALL_ROOT=$(pwd)/android && \
echo "Deploying in " && pwd && $ANDRQT_HOME/androiddeployqt --output android --verbose --input SapNetGui/*.json --sign $SRC_DIR/prod_build/android/essentials/key/release-key.jks $ALIAS --storepass $PASS --jdk $JAVA_HOME --gradle && \
mv -v $(pwd)/$APK_PATH/android-release-signed.apk $SRC_DIR/build/apk/"$BRAND-${VERSION}_$arch.apk" || \
exitcode=$?
cd ..
if [[ $exitcode != 0 ]]; then
echo "Build failed with exit code $exitcode"
cd $workdir
exit $exitcode
fi
done
cd $workdir
sapnet-client (5.9-37) testing; urgency=medium
* Fixes
-- Arkanoid Local <arkanoid@local> Sat, 21 Dec 2019 08:30:30 +0000
sapnet-client (5.9-36) develop; urgency=medium
* Fixes
-- Arkanoid Local <arkanoid@local> Sat, 30 Nov 2019 08:30:30 +0000
sapnet-client (5.9-35) develop; urgency=medium
* Merge branch 'bugs-2713' into 'develop'
*
* build up
*
* See merge request sap.support/sapnet-client!113
-- xapuyc <xapuyc@workspace> Thu, 12 Dec 2019 19:33:00 +0500
-- Arkanoid Local <arkanoid@local> Wed, 31 Aug 2019 08:30:30 +0000
sapnet-client (5.8-4) develop; urgency=medium
* Version bump IV
-- xapuyc <xapuyc@workspace> Mon, 24 Dec 2018 20:04:15 +0000
sapnet-client (5.7-40) testing; urgency=medium
* Version bump III
-- xapuyc <xapuyc@workspace> Wed, 31 Oct 2018 23:10:33 +0000
sapnet-client (5.7-37) testing; urgency=medium
* Non-maintainer upload
* Version bump II
-- xapuyc <xapuyc@workspace> Mon, 29 Oct 2018 18:58:55 +0500
sapnet-client (5.7-33) testing; urgency=medium
* Non-maintainer upload.
* Version bump
-- xapuyc <xapuyc@workspace> Thu, 18 Oct 2018 04:01:22 +0500
sapnet-client (5.7-7) testing; urgency=medium
* Tonns of rename
-- Arkanoid Local <naeper@arkanoid> Fri, 31 Aug 2018 07:17:33 +0000
sapnet-client (5.7-5) testing; urgency=medium
* New init build
-- naeper <naeper@arkanoid> Thu, 16 Aug 2018 10:10:44 +0000
sapnet-client (1.1-3) testing; urgency=medium
* Initial release
-- Arkanoid Local <arkanoid@local> Wed, 31 Aug 2017 08:30:30 +0000
9
File moved
Source: sapnet-client
Section: unknown
Priority: optional
Maintainer: support <support@ncodedcommunications.com>
Build-Depends: debhelper (>= 9)
Standards-Version: VER_MAJ.VER_MIN-VER_PAT
Homepage: https://ncodedcommunications.com
Package: ultrapad
Architecture: any
Depends: psmisc, menu, net-tools, ${shlibs:Depends}, ${misc:Depends}
Replaces: UltraPAD
Description: UltraPAD
Crossplatform VPN Application
sapnet-client_5.9-37_i386.buildinfo unknown optional
ultrapad-dbgsym_5.9-37_i386.deb debug optional automatic=yes
ultrapad_5.9-37_i386.deb unknown optional
#!/bin/bash -
case "$1" in
configure)
cp -f /opt/sap/ultrapad/share/init.d/UltraPadService.service /etc/init.d/ultrapadservice
chmod +x /etc/init.d/ultrapadservice
update-rc.d ultrapadservice defaults
service ultrapadservice restart
ln -s /opt/sap/ultrapad/bin/UltraPad /usr/local/bin/
cp -f /opt/sap/ultrapad/share/ultrapad.desktop /usr/share/applications/ultrapad.desktop
cp -f /opt/sap/ultrapad/share/ultrapad.png /usr/share/pixmaps/ultrapad.png
update-menus
<< --COMMENT--
--- It must be commented until we use rooted user. Uncomment to use UltraPAD user for service ---
adduser --force-badname UltraPAD
adduser UltraPAD netdev
chown -R UltraPAD /opt/sap/ultrapad/
chown UltraPAD /sys/class/dmi/id/product_uuid
ln -s /opt/sap/ultrapad/bin/UltraPad /usr/local/bin/
chown -h UltraPAD /usr/local/bin/UltraPad
chown UltraPAD /var/run/
sudo touch /etc/rc.local
sudo grep -q '^#!/bin/bash' /etc/rc.local && sudo sed -i '1i#!/bin/bash\' /etc/rc.local
sudo grep -q '^exit 0' /etc/rc.local && sudo sed -i '/exit 0/i chown UltraPAD /sys/class/dmi/id/product_uuid' /etc/rc.local || sudo sh -c "printf 'chown UltraPAD /sys/class/dmi/id/product_uuid\nexit 0' >> /etc/rc.local"
cp -f /opt/sap/ultrapad/share/init.d/UltraPadService.service /etc/init.d/ultrapadservice
chown UltraPAD /etc/init.d/ultrapadservice
chmod +x /etc/init.d/ultrapadservice
setcap 'CAP_MKNOD=epi CAP_NET_ADMIN=epi CAP_NET_BIND_SERVICE=epi CAP_NET_RAW=epi CAP_SYS_NICE=epi CAP_SYS_RAWIO=epi CAP_SYS_RESOURCE=epi CAP_SYSLOG=epi CAP_MAC_ADMIN=epi CAP_MAC_OVERRIDE=epi' /opt/sap/ultrapad/bin/UltraPadService
setcap 'CAP_MKNOD=epi CAP_NET_ADMIN=epi CAP_NET_BIND_SERVICE=epi CAP_NET_RAW=epi CAP_SYS_NICE=epi CAP_SYS_RAWIO=epi CAP_SYS_RESOURCE=epi CAP_SYSLOG=epi CAP_MAC_ADMIN=epi CAP_MAC_OVERRIDE=epi' /etc/init.d/ultrapadservice
setcap 'CAP_NET_ADMIN=epi' /bin/ip
update-menus
update-rc.d ultrapadservice defaults
service ultrapadservice start
cp -f /opt/sap/ultrapad/share/ultrapad.desktop /usr/share/applications/ultrapad.desktop
cp -f /opt/sap/ultrapad/share/ultrapad.png /usr/share/pixmaps/ultrapad.png
--COMMENT--
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 2
;;
esac
exit 0
#!/bin/bash -e
. /usr/share/debconf/confmodule
DAP_CHAINS_NAME="cellframe"
DAP_APP_NAME="$DAP_CHAINS_NAME-node"
DAP_PREFIX="/opt/$DAP_APP_NAME"
DAP_CFG_TPL="$DAP_PREFIX/share/configs/$DAP_APP_NAME.cfg.tpl"
# Store write config to new if present smth
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
# Check profile.d symlink
[ -e "/etc/profile.d/$DAP_APP_NAME.sh" ] && ln -sf $DAP_PREFIX/share/profile.d/$DAP_APP_NAME.sh /etc/profile.d/$DAP_APP_NAME.sh
# Init node config
if [ -e "$DAP_CFG" ]; then
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg.dpkg-new"
else
DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
fi
cat $DAP_CFG_TPL > $DAP_CFG || true
db_get cellframe-node/debug_mode || true
sed -i "s/{DEBUG_MODE}/$RET/" $DAP_CFG || true
db_get cellframe-node/auto_online || true
sed -i "s/{AUTO_ONLINE}/$RET/" $DAP_CFG || true
db_get cellframe-node/debug_stream_headers || true
sed -i "s/{DEBUG_STREAM_HEADERS}/$RET/" $DAP_CFG || true
db_get cellframe-node/server_enabled || true
sed -i "s/{SERVER_ENABLED}/$RET/" $DAP_CFG || true
db_get cellframe-node/server_port || true
sed -i "s/{SERVER_PORT}/$RET/" $DAP_CFG || true
db_get cellframe-node/server_addr || true
sed -i "s/{SERVER_ADDR}/$RET/" $DAP_CFG || true
# Init kelvin-testnet
NET_NAME="kelvin-testnet"
db_get cellframe-node/kelvin_testnet_enable || true
if [ "$RET"="true" ]; then
DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
DAP_NET_CFG=""
if [ -e "$DAP_CFG_NET" ]; then
DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
else
DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
fi
cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
db_get cellframe-node/kelvin_testnet_node_type || true
NODE_TYPE=$RET
sed -i "s/{NODE_TYPE}/$NODE_TYPE/" $DAP_NET_CFG || true
fi
mkdir -p $DAP_PREFIX/var/log || true
cat /etc/passwd| grep cellframe-node || adduser --system --no-create-home --group --home /opt/cellframe-node cellframe-node
echo "[*] Check /etc/systemd/system/$DAP_APP_NAME.service file..."
if [ -f /etc/systemd/system/$DAP_APP_NAME.service ]; then
echo "[*] Restarting $DAP_APP_NAME to implement changes"
systemctl --system stop $DAP_APP_NAME >> /dev/null|| true
systemctl daemon-reload || true
systemctl --system start $DAP_APP_NAME || true
else
echo "[!] Installing $DAP_APP_NAME as systemd service (haven't found /etc/systemd/system/$DAP_APP_NAME.service)"
ln -sf $DAP_PREFIX/share/$DAP_APP_NAME.service /etc/systemd/system/$DAP_APP_NAME.service || true
systemctl --system enable $DAP_PREFIX/share/$DAP_APP_NAME.service || true
# systemctl --system start $DAP_APP_NAME
echo "[ ] Execute 'systemctl start $DAP_APP_NAME' to start $DAP_APP_NAME service"
#USERMAN=`users | awk '{print $1}'`
adduser --system --no-create-home --group --home /opt/cellframe-node cellframe-node || true
#usermod -aG $DAP_CHAINS_NAME `users | awk '{print $1}'`
for username in $(cat /etc/passwd | grep "/home" | cut -d ':' -f1); do
usermod -aG cellframe-node $username
done
mkdir -p $DAP_PREFIX/var/{run,lib/ca,lib/wallet,lib/global_db}
touch $DAP_PREFIX/var/run/cellframe-node.pid
#chown -R $USERMAN:$USERMAN $DAP_PREFIX
for filename in $(find $DAP_PREFIX); do
if [ -d $filename ]; then
chmod 0775 $filename
else
chmod 0664 $filename
fi
done
chmod 0774 $DAP_PREFIX/bin/*
echo "[*] Done"
fi
File moved
#!/bin/sh
# preinst script for dapvpngui
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
#!/bin/bash
case "$1" in
purge|remove|abort-upgrade|failed-upgrade|upgrade)
[ -f /etc/init.d/ultrapadservice ] && service ultrapadservice stop
[ -d /opt/sap ] && rm -rf /opt/sap/
[ -f /usr/local/bin/UltraPad ] && rm /usr/local/bin/UltraPad
[ -f /etc/init.d/ultrapadservice ] && rm /etc/init.d/ultrapadservice
systemctl daemon-reload
[ -f /usr/share/applications/ultrapad.desktop ] && rm /usr/share/applications/ultrapad.desktop
[ -f /usr/share/pixmaps/ultrapad.png ] && rm /usr/share/pixmaps/ultrapad.png
<< --COMMENT--
killall UltraPAD
userdel --remove UltraPAD
systemctl daemon-reload
rm /usr/share/applications/ultrapad.desktop
rm /usr/share/pixmaps/ultrapad.png
--COMMENT--
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
exit 0
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/qmake.mk
override_dh_fixperms:
dh_fixperms -X/opt/cellframe-node
override_dh_auto_install:
dh_auto_install -- prefix=/opt/cellframe-node
%:
# dh $@ --with=systemd
dh $@
#!/bin/bash
# Start/stop the UltraPadService daemon.
#
### BEGIN INIT INFO
# Provides: ultrapadservice
# Required-Start: $syslog $time
# Required-Stop: $syslog $time
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: UltraPadService running tool.
# Description: UltraPadService running tool.
### END INIT INFO
#LSBNAMES='-l' # Uncomment for LSB name support in /etc/cron.d/
. /lib/lsb/init-functions
if [ ! -d "/opt/sap/UltraPAD/run" ]; then
# by user UltraPAD
#sudo -H -u UltraPAD mkdir -p /opt/sap/ultrapad/run
sudo mkdir -p /opt/sap/ultrapad/run
fi
if [ ! -d "/opt/sap/UltraPAD/log" ]; then
# by user UltraPAD
#sudo -H -u UltraPAD mkdir -p /opt/sap/ultrapad/log
sudo mkdir -pm 777 /opt/sap/ultrapad/log
fi
case "$1" in
start)
log_begin_msg "Starting UltraPadService..."
# Comented until we use root user.
#sudo chown UltraPAD /sys/class/dmi/id/product_uuid
#sudo -H -u UltraPAD /opt/sap/UltraPAD/bin/UltraPadService >>/opt/sap/UltraPAD/log/ultrapadservice.log 2>opt/sap/UltraPAD/log/ultrapadservice.log.err&
sudo /opt/sap/ultrapad/bin/UltraPadService&
log_end_msg $?
;;
stop)
log_begin_msg "Stopping UltraPadService..."
killall UltraPadService
log_end_msg 0
;;
restart|force-reload)
log_begin_msg "Restarting UltraPadService..."
service ultrapadservice stop
service ultrapadservice start
log_end_msg $?
;;
*)
log_success_msg "Usage: /etc/init.d/ultrapadservice {start|stop|restart|force-reload}"
exit 1
esac
exit 0
[Desktop Entry]
Name=UltraPad
Exec=/opt/sap/ultrapad/bin/UltraPad
Icon=/opt/sap/ultrapad/share/ultrapad.png
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Network;Application;
Name[en_US]=UltraPad
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment