Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #37 from RussellSenior/fix-sslh2

Browse source 
sslh: fix build by correcting version and refreshing makefile patch
This commit is contained in:
Florian Fainelli 2014-06-17 15:02:39 -07:00
commit dc19d17aa5
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/sslh/Makefile
View file

@ -1,5 +1,5 @@
#
# Copyright (C) 2009-2012 OpenWrt.org
# Copyright (C) 2009-2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sslh
PKG_VERSION:=1.16
PKG_RELEASE:=1
PKG_VERSION:=v1.16
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://rutschle.net/tech/

28
net/sslh/patches/001-no_sslh_select.patch
View file

@ -1,29 +1,29 @@
--- a/Makefile
+++ b/Makefile
@@ -37,16 +37,12 @@ all: sslh $(MAN) echosrv
$(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -c $<
@@ -45,16 +45,12 @@ all: sslh $(MAN) echosrv
version.h:
./genver.sh >version.h
-sslh: sslh-fork sslh-select
+sslh: sslh-fork
-sslh: $(OBJS) sslh-fork sslh-select
+sslh: $(OBJS) sslh-fork
sslh-fork: $(OBJS) sslh-fork.o Makefile common.h
$(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-fork sslh-fork.o $(OBJS) $(LIBS)
sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h
$(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS)
#strip sslh-fork
-sslh-select: $(OBJS) sslh-select.o Makefile common.h
- $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-select sslh-select.o $(OBJS) $(LIBS)
-sslh-select: version.h $(OBJS) sslh-select.o Makefile common.h
- $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS)
- #strip sslh-select
-
echosrv: $(OBJS) echosrv.o
$(CC) $(CFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS)
@@ -77,7 +73,7 @@ uninstall:
update-rc.d sslh remove
@@ -86,7 +82,7 @@ distclean: clean
rm -f tags cscope.*
clean:
- rm -f sslh-fork sslh-select echosrv $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info
+ rm -f sslh-fork echosrv $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info
- rm -f sslh-fork sslh-select echosrv version.h $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info
+ rm -f sslh-fork echosrv version.h $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info
tags:
ctags --globals -T *.[ch]