cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* respect CC/CFLAGS

Browse Source 
* split patches into separate files
This commit is contained in:
wilfried 2001-03-17 17:33:18 +00:00
parent ced194fad0
commit bb1af71e4d
19 changed files with 1329 additions and 2021 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mbone/sdr/patches/patch-aa
View File

@ -1,36 +0,0 @@
*** common/config_unix.h.orig Thu Sep 2 14:49:43 1999
--- common/config_unix.h Thu Sep 2 14:50:44 1999
***************
*** 50,56 ****
#include <signal.h>
#include <ctype.h>
! #ifndef __FreeBSD__
#include <malloc.h>
#endif
#include <stdio.h>
--- 50,56 ----
#include <signal.h>
#include <ctype.h>
! #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <stdio.h>
***************
*** 73,79 ****
#include <netdb.h>
#include <arpa/inet.h>
extern int h_errno;
! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
#include <stropts.h>
#include <sys/filio.h>
#endif /* HPUX */
--- 73,79 ----
#include <netdb.h>
#include <arpa/inet.h>
extern int h_errno;
! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <stropts.h>
#include <sys/filio.h>
#endif /* HPUX */

34
mbone/sdr/patches/patch-ab
View File

@ -1,34 +0,0 @@
*** sdr/src/sdr.h.orig Thu Sep 2 14:48:52 1999
--- sdr/src/sdr.h Thu Sep 2 14:51:47 1999
***************
*** 8,16 ****
#include "sys/stat.h"
#else
#include <sys/socket.h>
! #include <netinet/in.h>
! #include <arpa/inet.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <netdb.h>
#include <pwd.h>
--- 8,16 ----
#include "sys/stat.h"
#else
#include <sys/socket.h>
! #if !defined(__OpenBSD__)
#include <net/if.h>
+ #endif
#include <sys/ioctl.h>
#include <netdb.h>
#include <pwd.h>
***************
*** 18,23 ****
--- 18,25 ----
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
#include <arpa/nameser.h>
#include <resolv.h>
#ifdef AIX41

38
mbone/sdr/patches/patch-ac
View File

@ -1,38 +0,0 @@
*** common/configure.orig Thu Sep 2 14:54:02 1999
--- common/configure Thu Sep 2 14:55:24 1999
***************
*** 44,50 ****
;;
HP-UX ) OSTYPE=HPUX
;;
! Linux | IRIX | IRIX64 | FreeBSD | NetBSD )
;;
* ) echo "$OSTYPE not supported. Sorry."
exit
--- 44,50 ----
;;
HP-UX ) OSTYPE=HPUX
;;
! Linux | IRIX | IRIX64 | FreeBSD | NetBSD | OpenBSD )
;;
* ) echo "$OSTYPE not supported. Sorry."
exit
***************
*** 99,104 ****
--- 99,114 ----
PROFILE="-pg"
ECHO="echo -e"
;;
+ OpenBSD ) CC="gcc"
+ WFLAGS=$GCCWFLAGS
+ INCLUDE="-I/usr/local/include"
+ LDLIBS="-lm"
+ DEBUG="-g"
+ CHAR="-fsigned-char"
+ OPTIMIZE="-O4"
+ PROFILE="-pg"
+ ECHO=/bin/echo
+ ;;
FreeBSD ) CC="gcc"
WFLAGS=$GCCWFLAGS
INCLUDE="-I/usr/local/include"

19
mbone/sdr/patches/patch-ad
View File

@ -1,19 +0,0 @@
*** common/Makefile.in.orig Thu Sep 2 14:56:34 1999
--- common/Makefile.in Thu Sep 2 14:56:43 1999
***************
*** 3,9 ****
# This probably requires GNU make.
#
! CFLAGS = __WFLAGS__ __DEBUG__ __CHAR__ __PROFILE__ __OPTIMIZE__ __CHECK_FLAG__ __DEFS__ -D__OSTYPE__
INC = __INCLUDE__
CC = __CC__
AR = __AR__
--- 3,9 ----
# This probably requires GNU make.
#
! CFLAGS = __WFLAGS__ __DEBUG__ __CHAR__ __PROFILE__ __OPTIMIZE__ __CHECK_FLAG__ __DEFS__
INC = __INCLUDE__
CC = __CC__
AR = __AR__

17
mbone/sdr/patches/patch-ae
View File

@ -1,17 +0,0 @@
*** sdr/freebsd/Makefile.freebsd.orig Thu Sep 2 14:58:53 1999
--- sdr/freebsd/Makefile.freebsd Thu Sep 2 15:01:38 1999
***************
*** 1,6 ****
CC = gcc -g -O
! INCLUDES = -I/usr/X11R6/include -I../../tk-8.0/generic -I../../tcl-8.0/generic -I../../common
! LIBS = ../../tk-8.0/unix/libtk80.a ../../tcl-8.0/unix/libtcl80.a ../../common/libcommon.a -lm -L/usr/X11R6/lib -lX11 -lz
CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
all:: sdr
--- 1,6 ----
CC = gcc -g -O
! INCLUDES = -I/usr/X11R6/include -I../../common -I/usr/local/include/tcl8.0 -I/usr/local/include/tk8.0
! LIBS = -L/usr/local/lib -ltk80 -ltcl80 ../../common/libcommon.a -lm -L/usr/X11R6/lib -lX11 -lz
CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
all:: sdr

1877
mbone/sdr/patches/patch-af
View File

File diff suppressed because it is too large Load Diff

12
mbone/sdr/patches/patch-common_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-common_Makefile_in,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- common/Makefile.in.orig Sun Jul 4 23:57:30 1999
+++ common/Makefile.in Fri Mar 16 20:55:41 2001
@@ -3,7 +3,7 @@
# This probably requires GNU make.
#
-CFLAGS = __WFLAGS__ __DEBUG__ __CHAR__ __PROFILE__ __OPTIMIZE__ __CHECK_FLAG__ __DEFS__ -D__OSTYPE__
+CFLAGS = __WFLAGS__ __DEBUG__ __CHAR__ __PROFILE__ __OPTIMIZE__ __CHECK_FLAG__ __DEFS__
INC = __INCLUDE__
CC = __CC__
AR = __AR__

21
mbone/sdr/patches/patch-common_config_unix_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-common_config_unix_h,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- common/config_unix.h.orig Thu Jun 10 18:15:32 1999
+++ common/config_unix.h Fri Mar 16 20:55:41 2001
@@ -50,7 +50,7 @@
#include <signal.h>
#include <ctype.h>
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <stdio.h>
@@ -73,7 +73,7 @@
#include <netdb.h>
#include <arpa/inet.h>
extern int h_errno;
-#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
+#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <stropts.h>
#include <sys/filio.h>
#endif /* HPUX */

29
mbone/sdr/patches/patch-common_configure Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-common_configure,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- common/configure.orig Mon Jun 21 12:53:35 1999
+++ common/configure Fri Mar 16 20:56:34 2001
@@ -44,7 +44,7 @@ case $OSTYPE in
;;
HP-UX ) OSTYPE=HPUX
;;
- Linux | IRIX | IRIX64 | FreeBSD | NetBSD )
+ Linux | IRIX | IRIX64 | FreeBSD | NetBSD | OpenBSD )
;;
* ) echo "$OSTYPE not supported. Sorry."
exit
@@ -99,6 +99,16 @@ case $OSTYPE in
PROFILE="-pg"
ECHO="echo -e"
;;
+ OpenBSD )
+ WFLAGS="${CFLAGS}"
+ INCLUDE="-I/usr/local/include"
+ LDLIBS="-lm"
+ DEBUG="-g"
+ CHAR="-fsigned-char"
+ OPTIMIZE="-O4"
+ PROFILE="-pg"
+ ECHO=/bin/echo
+ ;;
FreeBSD ) CC="gcc"
WFLAGS=$GCCWFLAGS
INCLUDE="-I/usr/local/include"

14
mbone/sdr/patches/patch-sdr_freebsd_Makefile_freebsd Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-sdr_freebsd_Makefile_freebsd,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/freebsd/Makefile.freebsd.orig Tue May 25 23:27:24 1999
+++ sdr/freebsd/Makefile.freebsd Sat Mar 17 18:32:56 2001
@@ -1,7 +1,6 @@
-CC = gcc -g -O
-INCLUDES = -I/usr/X11R6/include -I../../tk-8.0/generic -I../../tcl-8.0/generic -I../../common
-LIBS = ../../tk-8.0/unix/libtk80.a ../../tcl-8.0/unix/libtcl80.a ../../common/libcommon.a -lm -L/usr/X11R6/lib -lX11 -lz
-CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
+INCLUDES = -I${X11BASE}/include -I../../common -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
+LIBS = -L${LOCALBASE}/lib -ltk80 -ltcl80 ../../common/libcommon.a -lm -L${X11BASE}/lib -lX11 -lz
+CFLAGS += $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
all:: sdr
install:

17
mbone/sdr/patches/patch-sdr_src_bitmaps_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-sdr_src_bitmaps_c,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/bitmaps.c.orig Tue May 25 23:27:45 1999
+++ sdr/src/bitmaps.c Fri Mar 16 20:55:41 2001
@@ -63,6 +63,7 @@ extern Tcl_Interp *interp;
#include "image_smeeting.xbm"
#include "image_stest.xbm"
#include "image_sdr.xbm"
+#include "image_directory.xbm"
void init_bitmaps()
{
@@ -95,4 +96,5 @@ void init_bitmaps()
Tk_DefineBitmap(interp, Tk_GetUid("stest"), stest_bits, stest_width, stest_height);
Tk_DefineBitmap(interp, Tk_GetUid("secure"), secure_bits, secure_width, secure_height);
Tk_DefineBitmap(interp, Tk_GetUid("sdr"), sdr_bits, sdr_width, sdr_height);
+ Tk_DefineBitmap(interp, Tk_GetUid("directory"), directory_bits, directory_width, directory_height);
}

13
mbone/sdr/patches/patch-sdr_src_cache_crypt_tcl Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-sdr_src_cache_crypt_tcl,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/cache_crypt.tcl.orig Thu Feb 25 19:51:09 1999
+++ sdr/src/cache_crypt.tcl Fri Mar 16 20:55:41 2001
@@ -104,8 +104,7 @@ proc write_cache {} {
catch {set ixnames [array names fullix]}
foreach i $ixnames {
if {$ldata($fullix($i),trust) != "sip"} {
- if {$ldata($fullix($i),list) == "norm"} {
-
+ if {[string match *norm $ldata($fullix($i),list)]} {
set filename "$dirname/cache/$fullix($i)"
write_cache_entry $fullix($i) $filename clear
} else {

12
mbone/sdr/patches/patch-sdr_src_cache_nocrypt_tcl Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sdr_src_cache_nocrypt_tcl,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/cache_nocrypt.tcl.orig Thu Mar 26 19:44:22 1998
+++ sdr/src/cache_nocrypt.tcl Fri Mar 16 20:55:41 2001
@@ -45,7 +45,7 @@ proc write_cache {} {
set ixnames {}
catch {set ixnames [array names fullix]}
foreach i $ixnames {
- if {$ldata($fullix($i),list)=="norm"} {
+ if {[string match *norm $ldata($fullix($i),list)]} {
set filename "$dirname/cache/$fullix($i)"
write_cache_entry $fullix($i) $filename clear
} else {

79
mbone/sdr/patches/patch-sdr_src_new_tcl Normal file
View File

@ -0,0 +1,79 @@
$OpenBSD: patch-sdr_src_new_tcl,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/new.tcl.orig Thu Feb 25 22:25:49 1999
+++ sdr/src/new.tcl Fri Mar 16 20:55:41 2001
@@ -10,16 +10,31 @@ set new_wiz_norm_panels \
set new_wiz_tech_panels \
"info type timing_tech scope_tech media_tech contact accept"
-proc new {aid} {
+proc new {aid {w .w0}} {
global ifstyle ldata
if {[string compare $aid "new"]!=0} {
#we need a working variable while we think about editing sessions,
#in case we don't commit the changes.
set ldata($aid,tmpmulticast) $ldata($aid,multicast)
}
+
+ # Hack to handle multiple directory windows:
+ # Temporarily change the available 'zones' to those that are
+ # appropriate for creating a new session in this directory:
+ global zone savedZoneData zoneDataForWindow
+ set savedZoneData [array get zone]
+ array set zone $zoneDataForWindow($w)
+
new_wiz_init $aid $ifstyle(create)
}
+proc cleanup_after_new {} {
+ destroy .new
+
+ # Restore the original zone data:
+ global zone savedZoneData
+ catch {array set zone $savedZoneData}
+}
proc new_wiz_init {aid iftype} {
global new_wiz_norm_panels new_wiz_tech_panels
@@ -50,7 +65,7 @@ proc new_wiz_init {aid iftype} {
-relief raised \
-borderwidth 1 -highlightthickness 0
pack .new.f.b.accept -side left -fill x -expand true
- button .new.f.b.cancel -text "Cancel" -command {destroy .new} \
+ button .new.f.b.cancel -text "Cancel" -command {cleanup_after_new} \
-relief raised \
-borderwidth 1 -highlightthickness 0
pack .new.f.b.cancel -side left -fill x -expand true
@@ -430,7 +445,7 @@ proc new_wiz_panel_accept {panelnum pane
.new.f.b.next configure -state disabled
.new.f.b.accept configure -state normal -command \
"if {\[create\]==1} \
- {destroy .new}"
+ {cleanup_after_new}"
.new.f.b.back configure -state normal -command "new_wiz_panel_[lindex $panels $back_panel] $back_panel \"$panels\" $aid"
new_mk_session_accept .new.f.f.accept .new.f.f $aid
}
@@ -1452,13 +1467,13 @@ proc new_mk_session_buttons {win aid} {
button $win.create -text [tt "Modify"] -command \
"if {\[create\]==1} \
{ do_ad_creation $aid;\
- destroy .new}"
+ cleanup_after_new}"
tixAddBalloon $win.create Button [tt "Click here to advertise the modified session.
Changing the session name may result in some sites seeing duplicate announcements for a while."]
} else {
button $win.create -text [tt "Create"] -command \
- "if {\[create\]==1} {destroy .new}" \
+ "if {\[create\]==1} {cleanup_after_new}" \
-highlightthickness 0
tixAddBalloon $win.create Button [tt "When you've filled out all the above information, click here to create and advertise this session"]
}
@@ -1469,7 +1484,7 @@ Changing the session name may result in
-highlightthickness 0
tixAddBalloon $win.help Button [tt "Click here for more help or to turn balloon help off"]
- button $win.dismiss -text "Dismiss" -command "destroy .new" \
+ button $win.dismiss -text "Dismiss" -command "cleanup_after_new" \
-highlightthickness 0
tixAddBalloon $win.dismiss Button [tt "Click here to close this window"]
pack $win.create -side left -fill x -expand true

24
mbone/sdr/patches/patch-sdr_src_plugins_tcl Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-sdr_src_plugins_tcl,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/plugins.tcl.orig Thu Jul 15 15:55:13 1999
+++ sdr/src/plugins.tcl Fri Mar 16 20:55:41 2001
@@ -637,12 +637,19 @@ proc start_media_tool {aid mnum proto fm
set tmp enabled
# catch {puts "$media.$proto.$fmt.[lindex $subrule 0]"}
catch {set tmp $tool_state($media.$proto.$fmt.[lindex $subrule 0])}
- if {$tmp=="enabled"} {
+ if {$tmp=="enabled" && $subrule != {}} {
lappend rulelist $subrule
}
}
}
if {[llength $rulelist]==0} {
+ # Special case for handling SDP/SAP directory sessions:
+ if {$media=="directory" && $proto=="SAP" && $fmt=="SDP"} {
+ return [launch_directory $ldata($aid,$mnum,addr) \
+ $ldata($aid,$mnum,port) \
+ $ldata($aid,ttl) \
+ $ldata($aid,session)]
+ }
set toollist {}
foreach subrule $rule {
lappend toollist [lindex $subrule 0]

15
mbone/sdr/patches/patch-sdr_src_sap_crypt_tcl Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-sdr_src_sap_crypt_tcl,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/sap_crypt.tcl.orig Thu Jun 24 15:20:52 1999
+++ sdr/src/sap_crypt.tcl Fri Mar 16 20:55:41 2001
@@ -874,6 +874,11 @@ proc create {} {
return 0
}
set sess "$sess\nc=IN IP4 [get_new_session_addr $media]/$ttl"
+ # Use a lower on-the-wire TTL if it would exceed our zone's:
+ if {[info exists zone(ttl,$zone(cur_zone))]
+ && $zone(ttl,$zone(cur_zone)) < $ttl} {
+ set ttl $zone(ttl,$zone(cur_zone))
+ }
if {$media_layers($media)>1} {
set sess "$sess/$media_layers($media)"
}

33
mbone/sdr/patches/patch-sdr_src_sd_listen_c Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-sdr_src_sd_listen_c,v 1.1 2001/03/17 17:33:19 wilfried Exp $
--- sdr/src/sd_listen.c.orig Fri Jul 16 15:07:27 1999
+++ sdr/src/sd_listen.c Fri Mar 16 20:55:41 2001
@@ -135,6 +135,7 @@ int doexit=FALSE;
int ui_visible=TRUE;
int debug1=FALSE;
jmp_buf env;
+unsigned initializationHasFinished = 0;
void dump(buf, buflen)
char *buf;
@@ -244,6 +245,12 @@ int sd_listen(char *address, int port, i
rx_sock_addr[*no_of_socks]=malloc(strlen(address)+1);
strcpy(rx_sock_addr[*no_of_socks], address);
rx_sock_port[*no_of_socks]=port;
+
+ if (initializationHasFinished) {
+ /* This socket was created after initialization, so start listening now */
+ linksocket(rxsock[*no_of_socks], TK_READABLE, (Tcl_FileProc*)recv_packets);
+ }
+
(*no_of_socks)++;
return(*no_of_socks);
}
@@ -1386,6 +1393,8 @@ char *argv[];
Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData) inChannel);
}
#endif
+
+ initializationHasFinished = 1;
while ((doexit==FALSE)||(Tk_GetNumMainWindows() > 0))
{

24
mbone/sdr/patches/patch-sdr_src_sdr_h Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-sdr_src_sdr_h,v 1.1 2001/03/17 17:33:20 wilfried Exp $
--- sdr/src/sdr.h.orig Tue May 25 17:59:36 1999
+++ sdr/src/sdr.h Fri Mar 16 20:55:41 2001
@@ -8,9 +8,9 @@
#include "sys/stat.h"
#else
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#if !defined(__OpenBSD__)
#include <net/if.h>
+#endif
#include <sys/ioctl.h>
#include <netdb.h>
#include <pwd.h>
@@ -18,6 +18,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include <arpa/nameser.h>
#include <resolv.h>
#ifdef AIX41

1036
mbone/sdr/patches/patch-sdr_src_sdr_tcl Normal file
View File

File diff suppressed because it is too large Load Diff