| 1 |
mduft |
1.1 |
upstream report: http://marc.info/?l=git&m=128774216918941&w=2
|
| 2 |
|
|
|
| 3 |
|
|
diff -ru git-1.7.3.1.orig/Makefile git-1.7.3.1/Makefile
|
| 4 |
|
|
--- git-1.7.3.1.orig/Makefile 2010-10-22 10:58:17 +0200
|
| 5 |
|
|
+++ git-1.7.3.1/Makefile 2010-10-22 11:17:28 +0200
|
| 6 |
|
|
@@ -1091,6 +1091,25 @@
|
| 7 |
|
|
endif
|
| 8 |
|
|
X = .exe
|
| 9 |
|
|
endif
|
| 10 |
|
|
+ifeq ($(uname_S),Interix)
|
| 11 |
|
|
+ NO_SYS_POLL_H = YesPlease
|
| 12 |
|
|
+ NO_INTTYPES_H = YesPlease
|
| 13 |
|
|
+ NO_INITGROUPS = YesPlease
|
| 14 |
|
|
+ NO_IPV6 = YesPlease
|
| 15 |
|
|
+ NO_MEMMEM = YesPlease
|
| 16 |
|
|
+ NO_MKDTEMP = YesPlease
|
| 17 |
|
|
+ NO_STRTOUMAX = YesPlease
|
| 18 |
|
|
+ NO_NSEC = YesPlease
|
| 19 |
|
|
+ NO_MKSTEMPS = YesPlease
|
| 20 |
|
|
+ ifeq ($(uname_R),3.5)
|
| 21 |
|
|
+ NO_INET_NTOP = YesPlease
|
| 22 |
|
|
+ NO_INET_PTON = YesPlease
|
| 23 |
|
|
+ endif
|
| 24 |
|
|
+ ifeq ($(uname_R),5.2)
|
| 25 |
|
|
+ NO_INET_NTOP = YesPlease
|
| 26 |
|
|
+ NO_INET_PTON = YesPlease
|
| 27 |
|
|
+ endif
|
| 28 |
|
|
+endif
|
| 29 |
|
|
ifneq (,$(findstring MINGW,$(uname_S)))
|
| 30 |
|
|
pathsep = ;
|
| 31 |
|
|
NO_PREAD = YesPlease
|
| 32 |
|
|
@@ -1354,6 +1373,15 @@
|
| 33 |
|
|
ifdef NO_SYS_SELECT_H
|
| 34 |
|
|
BASIC_CFLAGS += -DNO_SYS_SELECT_H
|
| 35 |
|
|
endif
|
| 36 |
|
|
+ifdef NO_SYS_POLL_H
|
| 37 |
|
|
+ BASIC_CFLAGS += -DNO_SYS_POLL_H
|
| 38 |
|
|
+endif
|
| 39 |
|
|
+ifdef NO_INTTYPES_H
|
| 40 |
|
|
+ BASIC_CFLAGS += -DNO_INTTYPES_H
|
| 41 |
|
|
+endif
|
| 42 |
|
|
+ifdef NO_INITGROUPS
|
| 43 |
|
|
+ BASIC_CFLAGS += -DNO_INITGROUPS
|
| 44 |
|
|
+endif
|
| 45 |
|
|
ifdef NO_MMAP
|
| 46 |
|
|
COMPAT_CFLAGS += -DNO_MMAP
|
| 47 |
|
|
COMPAT_OBJS += compat/mmap.o
|
| 48 |
|
|
diff -ru git-1.7.3.1.orig/daemon.c git-1.7.3.1/daemon.c
|
| 49 |
|
|
--- git-1.7.3.1.orig/daemon.c 2010-10-22 10:58:11 +0200
|
| 50 |
|
|
+++ git-1.7.3.1/daemon.c 2010-10-22 11:10:21 +0200
|
| 51 |
|
|
@@ -956,7 +956,11 @@
|
| 52 |
|
|
listen_addr, listen_port);
|
| 53 |
|
|
|
| 54 |
|
|
if (pass && gid &&
|
| 55 |
|
|
- (initgroups(pass->pw_name, gid) || setgid (gid) ||
|
| 56 |
|
|
+ (
|
| 57 |
|
|
+#ifndef NO_INITGROUPS
|
| 58 |
|
|
+ initgroups(pass->pw_name, gid) ||
|
| 59 |
|
|
+#endif
|
| 60 |
|
|
+ setgid (gid) ||
|
| 61 |
|
|
setuid(pass->pw_uid)))
|
| 62 |
|
|
die("cannot drop privileges");
|
| 63 |
|
|
|
| 64 |
|
|
diff -ru git-1.7.3.1.orig/git-compat-util.h git-1.7.3.1/git-compat-util.h
|
| 65 |
|
|
--- git-1.7.3.1.orig/git-compat-util.h 2010-10-22 10:58:16 +0200
|
| 66 |
|
|
+++ git-1.7.3.1/git-compat-util.h 2010-10-22 11:12:22 +0200
|
| 67 |
|
|
@@ -94,7 +94,11 @@
|
| 68 |
|
|
#include <utime.h>
|
| 69 |
|
|
#ifndef __MINGW32__
|
| 70 |
|
|
#include <sys/wait.h>
|
| 71 |
|
|
+#ifndef NO_SYS_POLL_H
|
| 72 |
|
|
#include <sys/poll.h>
|
| 73 |
|
|
+#else
|
| 74 |
|
|
+#include <poll.h>
|
| 75 |
|
|
+#endif
|
| 76 |
|
|
#include <sys/socket.h>
|
| 77 |
|
|
#include <sys/ioctl.h>
|
| 78 |
|
|
#include <termios.h>
|
| 79 |
|
|
@@ -106,7 +110,11 @@
|
| 80 |
|
|
#include <arpa/inet.h>
|
| 81 |
|
|
#include <netdb.h>
|
| 82 |
|
|
#include <pwd.h>
|
| 83 |
|
|
+#ifndef NO_INTTYPES_H
|
| 84 |
|
|
#include <inttypes.h>
|
| 85 |
|
|
+#else
|
| 86 |
|
|
+#include <stdint.h>
|
| 87 |
|
|
+#endif
|
| 88 |
|
|
#if defined(__CYGWIN__)
|
| 89 |
|
|
#undef _XOPEN_SOURCE
|
| 90 |
|
|
#include <grp.h>
|
Parent Directory
| 
Revision Log