kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 2.03

Browse source 
- Remove patches that are no longer needed
This commit is contained in:
Steve Wills 2011-10-04 14:51:25 +00:00
parent 3a2edac6d4
commit 348af7a784
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=282918
3 changed files with 2 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
security/arirang/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= arirang
PORTVERSION= 2.02
PORTREVISION= 2
PORTVERSION= 2.03
PORTEPOCH= 1
CATEGORIES= security www
MASTER_SITES= http://monkey.org/~pilot/arirang/
@ -33,8 +32,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/scanrule/*.uxe ${PREFIX}/share/arirang
${INSTALL_DATA} ${WRKSRC}/script/*.rb ${PREFIX}/share/arirang
.include <bsd.port.pre.mk>
.if ${RUBY_VER} == 1.9
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ruby19
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

19
security/arirang/files/extra-patch-ruby19
View file

@ -1,19 +0,0 @@
--- ariruby.c.orig 2011-07-24 21:50:51.119557755 -0400
+++ ariruby.c 2011-07-24 21:52:04.985558821 -0400
@@ -63,6 +63,7 @@
static int sock;
int nb = 0;
+void* rb_load_file_return;
struct sockaddr_in http;
struct hostent *he;
char *sendbuf = NULL;
@@ -132,7 +133,7 @@
ariruby_run(void)
{
int status;
- status = ruby_exec();
+ status = ruby_run_node(rb_load_file_return);
#ifdef DEBUG
printf("status = %d \n", status);
#endif

48
security/arirang/files/patch-ariruby.c
View file

@ -1,48 +0,0 @@
--- ariruby.c.orig 2011-04-27 21:34:36.000000000 -0400
+++ ariruby.c 2011-07-24 21:50:51.119557755 -0400
@@ -189,7 +189,7 @@
static VALUE
ariprint(VALUE self, VALUE outbuf)
{
- fprintf(stdout, "%s", RSTRING(outbuf)->ptr);
+ fprintf(stdout, "%s", RSTRING_PTR(outbuf));
return self;
}
@@ -198,14 +198,14 @@
arisend(VALUE self, VALUE data)
{
int len;
- len = RSTRING(data)->len;
+ len = RSTRING_LEN(data);
if ((sendbuf = (char *)malloc(len + 1)) == NULL) {
perror("arisend malloc failed");
close(sock);
exit(0);
}
- memcpy(sendbuf, RSTRING(data)->ptr, len);
+ memcpy(sendbuf, RSTRING_PTR(data), len);
if (len == 0) {
fprintf(stderr, "please set a data in arisend function \n");
@@ -519,9 +519,6 @@
if (sendbuf != NULL)
free(sendbuf);
- if (headbuf != NULL)
- free(headbuf);
-
if (nb == -1 || nb == -2) {
#if !(defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
alarm(0);
@@ -544,6 +541,9 @@
exit(0);
}
+ if (headbuf != NULL)
+ free(headbuf);
+
if (sslflags)
ssl_free(ctx, ssl);