mirror of https://github.com/hak5/openwrt-owl.git
123 lines
3.9 KiB
Diff
123 lines
3.9 KiB
Diff
diff -urN ser-0.8.14.old/Makefile ser-0.8.14.dev/Makefile
|
|
--- ser-0.8.14.old/Makefile 2004-07-27 01:18:34.000000000 +0200
|
|
+++ ser-0.8.14.dev/Makefile 2005-05-01 01:29:25.000000000 +0200
|
|
@@ -194,8 +194,8 @@
|
|
# binary dist. tar.gz
|
|
.PHONY: bin
|
|
bin:
|
|
- mkdir -p tmp/ser/usr/local
|
|
- $(MAKE) install basedir=tmp/ser prefix=/usr/local
|
|
+ mkdir -p tmp/ser/usr
|
|
+ $(MAKE) install basedir=tmp/ser prefix=/usr
|
|
$(TAR) -C tmp/ser/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz .
|
|
rm -rf tmp/ser
|
|
|
|
@@ -207,9 +207,9 @@
|
|
sunpkg:
|
|
mkdir -p tmp/ser
|
|
mkdir -p tmp/ser_sun_pkg
|
|
- $(MAKE) install basedir=tmp/ser prefix=/usr/local
|
|
+ $(MAKE) install basedir=tmp/ser prefix=/usr
|
|
(cd solaris; \
|
|
- pkgmk -r ../tmp/ser/usr/local -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
|
|
+ pkgmk -r ../tmp/ser/usr -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
|
|
cd ..)
|
|
cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
|
|
pkgtrans -s tmp/ser_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \
|
|
diff -urN ser-0.8.14.old/Makefile.defs ser-0.8.14.dev/Makefile.defs
|
|
--- ser-0.8.14.old/Makefile.defs 2005-05-01 01:18:12.000000000 +0200
|
|
+++ ser-0.8.14.dev/Makefile.defs 2005-05-01 01:42:55.000000000 +0200
|
|
@@ -64,20 +64,20 @@
|
|
# extra CC command line options (e.g -march=athlon-mp)
|
|
CC_EXTRA_OPTS ?=
|
|
# install location
|
|
-DESTDIR ?= /usr/local
|
|
+DESTDIR ?= /usr
|
|
PREFIX ?= $(DESTDIR)
|
|
-LOCALBASE ?= /usr/local
|
|
+LOCALBASE ?= /usr
|
|
prefix = $(PREFIX)
|
|
# install path is $(basedir) $(prefix)
|
|
# example:
|
|
-# creating a bin. archive in /tmp, which unpacks in /usr/local
|
|
+# creating a bin. archive in /tmp, which unpacks in /usr
|
|
# basedir=/tmp
|
|
-# prefix=/usr/local
|
|
+# prefix=/usr
|
|
|
|
BASEDIR ?=
|
|
basedir = $(BASEDIR)
|
|
# install prefixes for various stuff
|
|
-cfg-prefix = $(basedir)$(prefix)
|
|
+cfg-prefix = /
|
|
bin-prefix = $(basedir)$(prefix)
|
|
modules-prefix = $(basedir)$(prefix)
|
|
doc-prefix = $(basedir)$(prefix)
|
|
@@ -117,7 +117,7 @@
|
|
endif
|
|
ut-prefix = bin/
|
|
# target dirs for various stuff
|
|
-cfg-target = $(prefix)/$(cfg-dir)
|
|
+cfg-target = /$(cfg-dir)
|
|
modules-target = $(prefix)/$(modules-dir)
|
|
|
|
|
|
@@ -688,14 +688,14 @@
|
|
#MOD_LDFLAGS=-g -G
|
|
endif
|
|
ifneq ($(TLS),)
|
|
- DEFS+= -I/usr/local/ssl/include
|
|
+ DEFS+= -I/usr/ssl/include
|
|
endif
|
|
YACC=yacc
|
|
|
|
ifeq ($(CC_NAME), suncc)
|
|
LIBS= -lfast -ldl -lresolv
|
|
endif
|
|
- LIBS+= -L/usr/local/lib -lxnet -lrt -lnsl
|
|
+ LIBS+= -L/usr/lib -lxnet -lrt -lnsl
|
|
# -lrt needed for sched_yield
|
|
endif
|
|
|
|
@@ -773,7 +773,7 @@
|
|
|
|
#add libssl if needed
|
|
ifneq ($(TLS),)
|
|
-LIBS+= -L/usr/local/lib -L/usr/local/ssl/lib -lssl -lcrypto
|
|
+LIBS+= -L/usr/lib -L/usr/ssl/lib -lssl -lcrypto
|
|
endif
|
|
|
|
ifneq ($(found_lock_method), yes)
|
|
diff -urN ser-0.8.14.old/etc/ser.cfg ser-0.8.14.dev/etc/ser.cfg
|
|
--- ser-0.8.14.old/etc/ser.cfg 2003-11-10 16:35:15.000000000 +0100
|
|
+++ ser-0.8.14.dev/etc/ser.cfg 2005-05-01 01:28:43.000000000 +0200
|
|
@@ -26,19 +26,19 @@
|
|
# ------------------ module loading ----------------------------------
|
|
|
|
# Uncomment this if you want to use SQL database
|
|
-#loadmodule "/usr/local/lib/ser/modules/mysql.so"
|
|
+#loadmodule "/usr/lib/ser/modules/mysql.so"
|
|
|
|
-loadmodule "/usr/local/lib/ser/modules/sl.so"
|
|
-loadmodule "/usr/local/lib/ser/modules/tm.so"
|
|
-loadmodule "/usr/local/lib/ser/modules/rr.so"
|
|
-loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
|
|
-loadmodule "/usr/local/lib/ser/modules/usrloc.so"
|
|
-loadmodule "/usr/local/lib/ser/modules/registrar.so"
|
|
+loadmodule "/usr/lib/ser/modules/sl.so"
|
|
+loadmodule "/usr/lib/ser/modules/tm.so"
|
|
+loadmodule "/usr/lib/ser/modules/rr.so"
|
|
+loadmodule "/usr/lib/ser/modules/maxfwd.so"
|
|
+loadmodule "/usr/lib/ser/modules/usrloc.so"
|
|
+loadmodule "/usr/lib/ser/modules/registrar.so"
|
|
|
|
# Uncomment this if you want digest authentication
|
|
# mysql.so must be loaded !
|
|
-#loadmodule "/usr/local/lib/ser/modules/auth.so"
|
|
-#loadmodule "/usr/local/lib/ser/modules/auth_db.so"
|
|
+#loadmodule "/usr/lib/ser/modules/auth.so"
|
|
+#loadmodule "/usr/lib/ser/modules/auth_db.so"
|
|
|
|
# ----------------- setting module-specific parameters ---------------
|
|
|