Attachment 172965 Details for Bug 211107 – patch instead of 172745. change the names of files to new style.

[patch] patch instead of 172745. change the names of files to new style.

slsv-diff-final (text/plain), 5.62 KB, created by Konstantin Stroykovskiy on 2016-07-25 07:36:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Stroykovskiy

Created: 2016-07-25 07:36:22 UTC

Size: 5.62 KB

patch

obsolete

>diff -ruN databases/oracle8-client.orig/Makefile databases/oracle8-client/Makefile
>--- databases/oracle8-client.orig/Makefile	2014-07-27 10:02:53.000000000 +0000
>+++ databases/oracle8-client/Makefile	2016-07-22 10:20:59.712501000 +0000
>@@ -7,7 +7,7 @@
> CATEGORIES=	databases
> MASTER_SITES=	LOCAL/fjoe
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	bonkor@gmail.com
> COMMENT=	Oracle 8 client
> 
> USES=		tar:bzip2
>diff -ruN databases/oracle8-client.orig/files/patch-freebsd-Makefile databases/oracle8-client/files/patch-freebsd-Makefile
>--- databases/oracle8-client.orig/files/patch-freebsd-Makefile	2014-01-22 17:40:44.000000000 +0000
>+++ databases/oracle8-client/files/patch-freebsd-Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- freebsd/Makefile.orig	2007-11-15 10:50:25.000000000 +0600
>-+++ freebsd/Makefile	2007-11-15 10:50:10.000000000 +0600
>-@@ -5,6 +5,7 @@
>- NO_PIC=		yes
>- NO_OBJ=		yes
>- NO_PROFILE=	yes
>-+NO_WERROR=	yes
>- 
>- NOPIC=		yes
>- NOOBJ=		yes
>diff -ruN databases/oracle8-client.orig/files/patch-freebsd-oci8stub.c databases/oracle8-client/files/patch-freebsd-oci8stub.c
>--- databases/oracle8-client.orig/files/patch-freebsd-oci8stub.c	2014-01-22 17:40:44.000000000 +0000
>+++ databases/oracle8-client/files/patch-freebsd-oci8stub.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,39 +0,0 @@
>---- freebsd/oci8stub.c.orig	2007-11-11 12:25:01.000000000 +0600
>-+++ freebsd/oci8stub.c	2007-11-28 05:03:13.000000000 +0600
>-@@ -2,6 +2,7 @@
>- #include <sys/param.h>
>- #include <sys/stat.h>
>- #include <sys/resource.h>
>-+#include <sys/socket.h>
>- #include <assert.h>
>- #include <errno.h>
>- #include <dlfcn.h>
>-@@ -119,6 +120,13 @@
>- 
>- int __l_sigprocmask(int how, const sigset_t *set, sigset_t *oldset);
>- 
>-+struct l_sockaddr {
>-+	u_int16_t sa_family;
>-+	char sa_data[14];
>-+};
>-+
>-+int __l_connect(int s, const struct l_sockaddr *l_sa, socklen_t addrlen);
>-+
>- #ifdef stdin
>- #undef stdin
>- #undef stdout
>-@@ -528,3 +536,14 @@
>- 
>- 	return sigprocmask(how, set, oldset);
>- }
>-+
>-+int
>-+__l_connect(int s, const struct l_sockaddr *l_sa, socklen_t addrlen)
>-+{
>-+	struct sockaddr sa;
>-+
>-+	memcpy(sa.sa_data, l_sa->sa_data, sizeof(sa.sa_data));
>-+	sa.sa_len = addrlen;
>-+	sa.sa_family = l_sa->sa_family;
>-+	return connect(s, &sa, addrlen);
>-+}
>diff -ruN databases/oracle8-client.orig/files/patch-freebsd-redefine-syms.lst databases/oracle8-client/files/patch-freebsd-redefine-syms.lst
>--- databases/oracle8-client.orig/files/patch-freebsd-redefine-syms.lst	2014-01-22 17:40:44.000000000 +0000
>+++ databases/oracle8-client/files/patch-freebsd-redefine-syms.lst	1970-01-01 00:00:00.000000000 +0000
>@@ -1,6 +0,0 @@
>---- freebsd/redefine-syms.lst.orig	2005-06-20 23:23:35.000000000 +0700
>-+++ freebsd/redefine-syms.lst	2007-11-28 04:48:03.000000000 +0600
>-@@ -1,2 +1,3 @@
>-+connect __l_connect
>- lseek	__l_lseek
>- sigprocmask __l_sigprocmask
>diff -ruN databases/oracle8-client.orig/files/patch-freebsd_Makefile databases/oracle8-client/files/patch-freebsd_Makefile
>--- databases/oracle8-client.orig/files/patch-freebsd_Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ databases/oracle8-client/files/patch-freebsd_Makefile	2016-07-22 12:51:00.429625000 +0000
>@@ -0,0 +1,10 @@
>+--- freebsd/Makefile.orig	2007-11-11 06:35:21 UTC
>++++ freebsd/Makefile
>+@@ -5,6 +5,7 @@ WARNS=		6
>+ NO_PIC=		yes
>+ NO_OBJ=		yes
>+ NO_PROFILE=	yes
>++NO_WERROR=	yes
>+ 
>+ NOPIC=		yes
>+ NOOBJ=		yes
>diff -ruN databases/oracle8-client.orig/files/patch-freebsd_oci8stub.c databases/oracle8-client/files/patch-freebsd_oci8stub.c
>--- databases/oracle8-client.orig/files/patch-freebsd_oci8stub.c	1970-01-01 00:00:00.000000000 +0000
>+++ databases/oracle8-client/files/patch-freebsd_oci8stub.c	2016-07-22 12:51:00.433271000 +0000
>@@ -0,0 +1,53 @@
>+--- freebsd/oci8stub.c.orig	2007-11-11 06:25:01 UTC
>++++ freebsd/oci8stub.c
>+@@ -2,6 +2,7 @@
>+ #include <sys/param.h>
>+ #include <sys/stat.h>
>+ #include <sys/resource.h>
>++#include <sys/socket.h>
>+ #include <assert.h>
>+ #include <errno.h>
>+ #include <dlfcn.h>
>+@@ -119,6 +120,14 @@ static void bsd_stat_to_linux64(struct s
>+ 
>+ int __l_sigprocmask(int how, const sigset_t *set, sigset_t *oldset);
>+ 
>++struct l_sockaddr {
>++	u_int16_t sa_family;
>++	char sa_data[14];
>++};
>++
>++int __l_connect(int s, const struct l_sockaddr *l_sa, socklen_t addrlen);
>++int __l_sigaction(int signum, const struct sigaction *l_act, struct sigaction *oldact);
>++
>+ #ifdef stdin
>+ #undef stdin
>+ #undef stdout
>+@@ -528,3 +537,27 @@ __l_sigprocmask(int l_how, const sigset_
>+ 
>+ 	return sigprocmask(how, set, oldset);
>+ }
>++
>++int
>++__l_connect(int s, const struct l_sockaddr *l_sa, socklen_t addrlen)
>++{
>++	struct sockaddr sa;
>++
>++	memcpy(sa.sa_data, l_sa->sa_data, sizeof(sa.sa_data));
>++	sa.sa_len = addrlen;
>++	sa.sa_family = l_sa->sa_family;
>++	return connect(s, &sa, addrlen);
>++}
>++
>++int 
>++__l_sigaction(int signum, const struct sigaction *l_act, struct sigaction *oldact)
>++{
>++	struct sigaction act;
>++
>++	act.sa_handler = l_act->sa_handler;
>++	act.sa_flags = l_act->sa_flags & (SA_ONSTACK | SA_RESTART | SA_RESETHAND |
>++		SA_NOCLDSTOP | SA_NODEFER | SA_NOCLDWAIT | SA_SIGINFO);
>++	act.sa_mask = l_act->sa_mask;
>++	return sigaction(signum, &act, oldact);
>++}
>++
>diff -ruN databases/oracle8-client.orig/files/patch-freebsd_redefine-syms.lst databases/oracle8-client/files/patch-freebsd_redefine-syms.lst
>--- databases/oracle8-client.orig/files/patch-freebsd_redefine-syms.lst	1970-01-01 00:00:00.000000000 +0000
>+++ databases/oracle8-client/files/patch-freebsd_redefine-syms.lst	2016-07-22 12:51:00.436632000 +0000
>@@ -0,0 +1,7 @@
>+--- freebsd/redefine-syms.lst.orig	2005-06-20 16:23:35 UTC
>++++ freebsd/redefine-syms.lst
>+@@ -1,2 +1,4 @@
>++connect __l_connect
>+ lseek	__l_lseek
>+ sigprocmask __l_sigprocmask
>++sigaction __l_sigaction

Actions: View | Diff

Attachments on bug 211107: 172501 | 172512 | 172513 | 172745 | 172965 | 172968 | 172969