parent
d5b15895ef
commit
9114220553
File diff suppressed because it is too large
Load Diff
@ -1,126 +1,90 @@ |
||||
diff -rhNp comgt.0.32/Makefile gcom-032/Makefile
|
||||
*** comgt.0.32/Makefile 2007-02-10 19:07:58.723709368 +0100
|
||||
--- gcom-032/Makefile 2007-02-10 19:18:26.764232696 +0100
|
||||
***************
|
||||
*** 1,7 ****
|
||||
#
|
||||
! # Makefile - build and install the comgt package
|
||||
# Copyright (C) 2005 Martin Gregorie
|
||||
- # Copyright (C) 2006 Paul Hardwick
|
||||
#
|
||||
# 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
|
||||
--- 1,6 ----
|
||||
#
|
||||
! # Makefile - build and install the gmon package
|
||||
# Copyright (C) 2005 Martin Gregorie
|
||||
#
|
||||
# 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
|
||||
***************
|
||||
*** 17,79 ****
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
! # martin@gregorie.org, paul@peck.org.uk
|
||||
#
|
||||
! # $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
|
||||
#
|
||||
- #
|
||||
-
|
||||
- LIB = -L/usr/local/lib
|
||||
- INC = -I/usr/local/include
|
||||
EXE = /usr/local/bin
|
||||
MAN = /usr/share/man/man1
|
||||
! CPROG = comgt
|
||||
! SCRIPTPATH = /etc/comgt/
|
||||
! SCRIPTSRC = ./scripts/
|
||||
! BIN = $(CPROG)
|
||||
! MANP = comgt.1 sigmon.1
|
||||
!
|
||||
! CFLAGS = -c
|
||||
! LDFLAGS =
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
install:
|
||||
chmod a-w $(BIN)
|
||||
chmod u+rw $(BIN)
|
||||
chmod a+x $(BIN)
|
||||
! cp $(BIN) $(EXE)
|
||||
chmod a-wx $(MANP)
|
||||
chmod u+rw $(MANP)
|
||||
chmod a+r $(MANP)
|
||||
cp $(MANP) $(MAN)
|
||||
- -mkdir $(SCRIPTPATH)
|
||||
- chmod a-w $(SCRIPTPATH)
|
||||
- chmod u+rw $(SCRIPTPATH)
|
||||
- chmod a+x $(SCRIPTPATH)
|
||||
- cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
|
||||
- chmod a-w $(SCRIPTPATH)*
|
||||
- chmod u+rw $(SCRIPTPATH)*
|
||||
- chmod a+x $(SCRIPTPATH)*
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
uninstall:
|
||||
cd $(EXE); rm $(BIN)
|
||||
cd $(MAN); rm $(MANP)
|
||||
- -rm -r $(SCRIPTPATH)
|
||||
|
||||
clean:
|
||||
! -rm *.o
|
||||
! -rm $(CPROG)
|
||||
! -rm *~
|
||||
! -rm $(SCRIPTSRC)*~
|
||||
|
||||
|
||||
! comgt: comgt.o
|
||||
! cc comgt.o $(LDFLAGS) -o comgt
|
||||
|
||||
! comgt.o: comgt.c comgt.h
|
||||
! cc comgt.c $(CFLAGS)
|
||||
|
||||
--- 16,56 ----
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
! # martin@gregorie.org
|
||||
#
|
||||
! # $Id$
|
||||
#
|
||||
EXE = /usr/local/bin
|
||||
MAN = /usr/share/man/man1
|
||||
! CPROG = gcom
|
||||
! SCRIPT = sigmon
|
||||
! BIN = $(CPROG) $(SCRIPT)
|
||||
! MANP = gcom.1 sigmon.1
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
install:
|
||||
+ mv ($BIN} {$BIN2}
|
||||
chmod a-w $(BIN)
|
||||
chmod u+rw $(BIN)
|
||||
chmod a+x $(BIN)
|
||||
! cp $(BIN) $(EXE)/gcom
|
||||
chmod a-wx $(MANP)
|
||||
chmod u+rw $(MANP)
|
||||
chmod a+r $(MANP)
|
||||
cp $(MANP) $(MAN)
|
||||
|
||||
uninstall:
|
||||
cd $(EXE); rm $(BIN)
|
||||
cd $(MAN); rm $(MANP)
|
||||
|
||||
clean:
|
||||
! rm *.o $(CPROG)
|
||||
|
||||
|
||||
! gcom: gcom.o
|
||||
! $(CC) gcom.o $(LDFLAGS) -o gcom
|
||||
|
||||
! gcom.o: comgt.c comgt.h
|
||||
! $(CC) -c $(CFLAGS) comgt.c -o gcom.o
|
||||
|
||||
Index: comgt.0.32/Makefile
|
||||
===================================================================
|
||||
--- comgt.0.32.orig/Makefile 2007-06-04 13:22:22.665409616 +0200
|
||||
+++ comgt.0.32/Makefile 2007-06-04 13:22:22.730399736 +0200
|
||||
@@ -1,7 +1,6 @@
|
||||
#
|
||||
-# Makefile - build and install the comgt package
|
||||
+# Makefile - build and install the gmon package
|
||||
# Copyright (C) 2005 Martin Gregorie
|
||||
-# Copyright (C) 2006 Paul Hardwick
|
||||
#
|
||||
# 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
|
||||
@@ -17,63 +16,41 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
-# martin@gregorie.org, paul@peck.org.uk
|
||||
+# martin@gregorie.org
|
||||
#
|
||||
-# $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
|
||||
+# $Id$
|
||||
#
|
||||
-#
|
||||
-
|
||||
-LIB = -L/usr/local/lib
|
||||
-INC = -I/usr/local/include
|
||||
EXE = /usr/local/bin
|
||||
MAN = /usr/share/man/man1
|
||||
-CPROG = comgt
|
||||
-SCRIPTPATH = /etc/comgt/
|
||||
-SCRIPTSRC = ./scripts/
|
||||
-BIN = $(CPROG)
|
||||
-MANP = comgt.1 sigmon.1
|
||||
-
|
||||
-CFLAGS = -c
|
||||
-LDFLAGS =
|
||||
+CPROG = gcom
|
||||
+SCRIPT = sigmon
|
||||
+BIN = $(CPROG) $(SCRIPT)
|
||||
+MANP = gcom.1 sigmon.1
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
install:
|
||||
+ mv ($BIN} {$BIN2}
|
||||
chmod a-w $(BIN)
|
||||
chmod u+rw $(BIN)
|
||||
chmod a+x $(BIN)
|
||||
- cp $(BIN) $(EXE)
|
||||
+ cp $(BIN) $(EXE)/gcom
|
||||
chmod a-wx $(MANP)
|
||||
chmod u+rw $(MANP)
|
||||
chmod a+r $(MANP)
|
||||
cp $(MANP) $(MAN)
|
||||
- -mkdir $(SCRIPTPATH)
|
||||
- chmod a-w $(SCRIPTPATH)
|
||||
- chmod u+rw $(SCRIPTPATH)
|
||||
- chmod a+x $(SCRIPTPATH)
|
||||
- cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
|
||||
- chmod a-w $(SCRIPTPATH)*
|
||||
- chmod u+rw $(SCRIPTPATH)*
|
||||
- chmod a+x $(SCRIPTPATH)*
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
uninstall:
|
||||
cd $(EXE); rm $(BIN)
|
||||
cd $(MAN); rm $(MANP)
|
||||
- -rm -r $(SCRIPTPATH)
|
||||
|
||||
clean:
|
||||
- -rm *.o
|
||||
- -rm $(CPROG)
|
||||
- -rm *~
|
||||
- -rm $(SCRIPTSRC)*~
|
||||
+ rm *.o $(CPROG)
|
||||
|
||||
|
||||
-comgt: comgt.o
|
||||
- cc comgt.o $(LDFLAGS) -o comgt
|
||||
+gcom: gcom.o
|
||||
+ $(CC) gcom.o $(LDFLAGS) -o gcom
|
||||
|
||||
-comgt.o: comgt.c comgt.h
|
||||
- cc comgt.c $(CFLAGS)
|
||||
+gcom.o: comgt.c comgt.h
|
||||
+ $(CC) -c $(CFLAGS) comgt.c -o gcom.o
|
||||
|
||||
|
@ -1,28 +1,17 @@ |
||||
diff -ur db.old/common-channel.c db.dev/common-channel.c
|
||||
--- db.old/common-channel.c 2007-02-22 17:17:15.000000000 +0100
|
||||
+++ db.dev/common-channel.c 2007-05-06 19:50:19.154943528 +0200
|
||||
@@ -309,15 +309,15 @@
|
||||
&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)) {
|
||||
Index: dropbear-0.49/common-channel.c
|
||||
===================================================================
|
||||
--- dropbear-0.49.orig/common-channel.c 2007-06-04 13:21:39.354993800 +0200
|
||||
+++ dropbear-0.49/common-channel.c 2007-06-04 13:21:40.676792856 +0200
|
||||
@@ -310,10 +310,10 @@
|
||||
send_msg_channel_eof(channel);
|
||||
}
|
||||
-
|
||||
|
||||
- /* And if we can't receive any more data from them either, close up */
|
||||
- if (!channel->sent_close
|
||||
- && channel->readfd == FD_CLOSED
|
||||
- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
|
||||
- && !write_pending(channel)) {
|
||||
- TRACE(("sending close, readfd is closed"))
|
||||
- send_msg_channel_close(channel);
|
||||
- }
|
||||
+
|
||||
+ /* And if we can't receive any more data from them either, close up (server only) */
|
||||
+ if (!channel->sent_close
|
||||
+ && channel->readfd == FD_CLOSED
|
||||
if (!channel->sent_close
|
||||
&& channel->readfd == FD_CLOSED
|
||||
- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
|
||||
+ && !ERRFD_IS_WRITE(channel)
|
||||
+ && !write_pending(channel)) {
|
||||
+ TRACE(("sending close, readfd is closed"))
|
||||
+ send_msg_channel_close(channel);
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Check whether a deferred (EINPROGRESS) connect() was successful, and
|
||||
&& !write_pending(channel)) {
|
||||
TRACE(("sending close, readfd is closed"))
|
||||
send_msg_channel_close(channel);
|
||||
|
@ -1,12 +1,13 @@ |
||||
diff -ruN fuse-2.4.1-old/util/Makefile.in fuse-2.4.1-new/util/Makefile.in
|
||||
--- fuse-2.4.1-old/util/Makefile.in 2005-10-17 12:29:20.000000000 +0200
|
||||
+++ fuse-2.4.1-new/util/Makefile.in 2005-10-19 17:11:13.000000000 +0200
|
||||
@@ -445,7 +445,7 @@
|
||||
Index: fuse-2.6.3/util/Makefile.in
|
||||
===================================================================
|
||||
--- fuse-2.6.3.orig/util/Makefile.in 2007-06-04 13:22:29.674344096 +0200
|
||||
+++ fuse-2.6.3/util/Makefile.in 2007-06-04 13:22:30.163269768 +0200
|
||||
@@ -489,7 +489,7 @@
|
||||
install-exec-hook:
|
||||
-chown root $(DESTDIR)$(bindir)/fusermount
|
||||
-chmod u+s $(DESTDIR)$(bindir)/fusermount
|
||||
- @if test ! -e $(DESTDIR)/dev/fuse; then \
|
||||
+ -@if test ! -e $(DESTDIR)/dev/fuse; then \
|
||||
$(mkdir_p) $(DESTDIR)/dev; \
|
||||
echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
|
||||
mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
|
||||
echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
|
||||
mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
|
||||
|
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue