diff --git a/Makefile b/Makefile index 0d64d25..72e6be4 100644 --- a/Makefile +++ b/Makefile @@ -1,37 +1,42 @@ CC = gcc -CFLAGS += -Wall -std=gnu99 -O3 -Iinclude +CFLAGS += -Wall -g -std=gnu99 -O2 -Iinclude LDFLAGS += NAME = zoketed SRCS := zokete.c logger.c server.c OBJS := $(SRCS:%.c=obj/%.o) -all: dirs $(NAME) - -dirs: - mkdir -p obj - $(NAME): $(OBJS) @$(CC) $(OBJS) $(LDFLAGS) -o $@ @echo "Linking complete!" $(OBJS): obj/%.o : src/%.c - @$(CC) $(CFLAGS) -c $< -o $@ + @$(CC) $(USER_DEFINES) $(CFLAGS) -c $< -o $@ @echo "Compiled "$<" successfully!" +.PHONY: all +all: dirs $(NAME) + +.PHONY: dirs +dirs: + mkdir -p obj + +.PHONY: clean clean: rm -f $(OBJS) +.PHONY: fclean fclean: clean rm -f $(NAME) +.PHONY: re re: fclean all .PHONY: install install: $(NAME) - mkdir -p $(DESTDIR)$(PREFIX)/$(BINDIR) - cp $(NAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(NAME) + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp $(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) .PHONY: uninstall uninstall: diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e3ccd25 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +zokete (1.0.0) unstable; urgency=low + + * Initial release + + -- Jorge Matricali Wed, 25 Dec 2019 15:28:29 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..5def9d1 --- /dev/null +++ b/debian/control @@ -0,0 +1,15 @@ +Source: zokete +Section: net +Priority: optional +Maintainer: Jorge Matricali +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.4 +Homepage: https://github.com/matricali/zokete +Vcs-Git: git://github.com/matricali/zokete.git +Vcs-Browser: https://github.com/matricali/zokete + +Package: zokete +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple SOCKS5 server + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..1d1824c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,33 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: zokete +Source: https://github.com/matricali/zokete + +Files: * +Copyright: 2019 Jorge Matricali +License: GPL-3.0+ + +Files: debian/* +Copyright: 2019 Jorge Matricali +License: GPL-3.0+ + +License: GPL-3.0+ + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..d99978a --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +LICENSE.txt +README.md diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..218df65 --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/zokete.default b/debian/zokete.default new file mode 100644 index 0000000..e6f1597 --- /dev/null +++ b/debian/zokete.default @@ -0,0 +1,10 @@ +# Defaults for zokete initscript +# sourced by /etc/init.d/zokete +# installed at /etc/default/zokete by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" diff --git a/debian/zokete.init b/debian/zokete.init new file mode 100644 index 0000000..9ff4d0e --- /dev/null +++ b/debian/zokete.init @@ -0,0 +1,166 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: zokete +# Required-Start: $local_fs $network $remote_fs $syslog +# Required-Stop: $local_fs $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: +# Description: +# <...> +# <...> +### END INIT INFO + +# Author: Jorge Matricali + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="zokete" +NAME=zokete +DAEMON=/bin/zoketed +DAEMON_ARGS="" +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # The above code will not work for interpreted scripts, use the next + # six lines below instead (Ref: #643337, start-stop-daemon(8) ) + #start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON \ + # --name $NAME --test > /dev/null \ + # || return 1 + #start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON \ + # --name $NAME -- $DAEMON_ARGS \ + # || return 2 + + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/debian/zokete.manpages b/debian/zokete.manpages new file mode 100644 index 0000000..b5b17c7 --- /dev/null +++ b/debian/zokete.manpages @@ -0,0 +1 @@ +docs/man/zoketed.8