Subversion Repositories ssvnc

Compare Revisions

Ignore whitespace Rev 44 → Rev 49

/ssvnc/tags/1.0.29-3/debian/patches/buildflags.patch
5,7 → 5,7
 
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ config:
@@ -53,10 +53,10 @@ config:
@echo Now run: "'make all'"
all:
14,5 → 14,19
+ cd $(VSRC)/libvncauth; $(MAKE) EXTRA_DEFINES="$(CPPFLAGS)" CDEBUGFLAGS="$(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)"
+ cd $(VSRC)/vncviewer; $(MAKE) EXTRA_DEFINES="$(CPPFLAGS)" CDEBUGFLAGS="$(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)"
if [ "X$(JSRC)" != "X" ]; then cd $(JSRC); $(MAKE); fi
cd $(PSRC); $(MAKE)
- cd $(PSRC); $(MAKE)
+ cd $(PSRC); $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
clean:
cd $(VSRC)/libvncauth; $(MAKE) clean
--- a/vncstorepw/Makefile
+++ b/vncstorepw/Makefile
@@ -8,7 +8,7 @@ LIMACC = lim_accept.so
ULTDSM = ultravnc_dsm_helper
# gcc must be used:
-CC = gcc
+CC = gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
all: $(CMD) $(UNWRAP) $(LIMACC) $(ULTDSM)
/ssvnc/tags/1.0.29-3/debian/patches/nostrip.patch
10,3 → 10,21
cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
--- a/vncstorepw/Makefile
+++ b/vncstorepw/Makefile
@@ -14,7 +14,6 @@ all: $(CMD) $(UNWRAP) $(LIMACC) $(ULTDSM
$(CMD): vncauth.o vncstorepw.o d3des.o
PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
- PATH=$$PATH:$(EPATH) strip $(CMD)
@ls -l $(CMD)
$(UNWRAP): unwrap.c
@@ -41,7 +40,6 @@ $(ULTDSM): ultravnc_dsm_helper.c
else \
PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto; \
fi
- PATH=$$PATH:$(EPATH) strip $(ULTDSM)
@ls -l $(ULTDSM)
test: $(CMD)
/ssvnc/tags/1.0.29-3/debian/patches/openssl1.1.patch
62,10 → 62,10
}
- if (ivec_size < Cipher->iv_len && !securevnc) {
+ if (ivec_size < EVP_CIPHER_CTX_iv_length(Cipher) && !securevnc) {
+ if (ivec_size < EVP_CIPHER_iv_length(Cipher) && !securevnc) {
fprintf(stderr, "%s: %s - WARNING: short IV %d < %d\n",
- prog, encstr, ivec_size, Cipher->iv_len);
+ prog, encstr, ivec_size, EVP_CIPHER_CTX_iv_length(Cipher));
+ prog, encstr, ivec_size, EVP_CIPHER_iv_length(Cipher));
}
/* make the hashed value and place in keystr */
/ssvnc/tags/1.0.29-3/debian/patches/series
1,7 → 1,7
confusing_-h.patch
ultraftp_path.patch
nostrip.patch
buildflags.patch
nostrip.patch
format-security.patch
openssl1.1.patch
auto-scale.patch