Attachment #218421 for bug #249994

View | Details | Raw Unified | Return to bug 249994
Collapse All | Expand All

Lines 2-9 Link Here

(-)sysutils/reptyr/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= reptyr	4	PORTNAME= reptyr
5	PORTVERSION= 0.6.3a	5	PORTVERSION= 0.8.0
6	PORTREVISION= 2
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8		7
9	MAINTAINER= andoriyu@gmail.com	8	MAINTAINER= andoriyu@gmail.com
Lines 13-19 Link Here
13		12
14	USE_GITHUB= yes	13	USE_GITHUB= yes
15	GH_ACCOUNT= nelhage	14	GH_ACCOUNT= nelhage
16	GH_TAGNAME= 6fb15adb4552e170bcd5e648803da83dba57283b	15	GH_TAGNAME= reptyr-${PORTVERSION}
17		16
18	MAKE_ARGS= BASHCOMPDIR=${PREFIX}/share/bash-completion/completions \	17	MAKE_ARGS= BASHCOMPDIR=${PREFIX}/share/bash-completion/completions \
19	MANDIR=${MANPREFIX}/man	18	MANDIR=${MANPREFIX}/man

Lines 1-2 Link Here

(-)sysutils/reptyr/distinfo (-2 / +3 lines)
1	SHA256 (nelhage-reptyr-0.6.3a-6fb15adb4552e170bcd5e648803da83dba57283b_GH0.tar.gz) = 9ee7983de2f4ab8bb56e3fdbcaad20d03733e75befb34003f95eddaface655f8	1	TIMESTAMP = 1601416039
2	SIZE (nelhage-reptyr-0.6.3a-6fb15adb4552e170bcd5e648803da83dba57283b_GH0.tar.gz) = 28883	2	SHA256 (nelhage-reptyr-0.8.0-reptyr-0.8.0_GH0.tar.gz) = 4b470ed2a0d25fed591739fa9613ce7ad3d0377891eb56cbe914e3c85db46ca8
		3	SIZE (nelhage-reptyr-0.8.0-reptyr-0.8.0_GH0.tar.gz) = 32239




commit 308f60064fee6d5707514b65f6acad656a8a4feb
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date:   Tue Feb 2 19:04:11 2016 +0100

    FreeBSD: Do not try to cast NULL to int.

    Passing NULL to the data parameter in calls to ptrace(2) causes failures
    on 64-bit FreeBSD 9 installations, where GCC 4.2.1 complains like this:

    platform/freebsd/arch/x86_common.h: In function 'arch_get_register':
    platform/freebsd/arch/x86_common.h:48: warning: cast from pointer to integer of different size
    platform/freebsd/arch/x86_common.h: In function 'arch_set_register':
    platform/freebsd/arch/x86_common.h:57: warning: cast from pointer to integer of different size
    platform/freebsd/arch/x86_common.h:59: warning: cast from pointer to integer of different size
    platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_to_child':
    platform/freebsd/freebsd_ptrace.c:267: warning: cast from pointer to integer of different size
    platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_from_child':
    platform/freebsd/freebsd_ptrace.c:282: warning: cast from pointer to integer of different size

    Make ptrace_command pass 0 to _ptrace_command so that the final
    expansion looks like this:
      __ptrace_command((cld), (req), (void*)(addr), (int)(0))
    instead of
      __ptrace_command((cld), (req), (void*)(addr), (int)(((void*)0)))

--- platform/freebsd/freebsd_ptrace.c
+++ platform/freebsd/freebsd_ptrace.c
@@ -47,7 +47,7 @@
 static int __ptrace_command(struct ptrace_child *child, int req,
                             void *, int);
 
-#define ptrace_command(cld, req, ...) _ptrace_command(cld, req, ## __VA_ARGS__, NULL, NULL)
+#define ptrace_command(cld, req, ...) _ptrace_command(cld, req, ## __VA_ARGS__, 0, 0)
 #define _ptrace_command(cld, req, addr, data, ...) __ptrace_command((cld), (req), (void*)(addr), (int)(data))
 
 




Fix the build on FreeBSD 9:

cc1: warnings being treated as errors
platform/freebsd/freebsd.c: In function 'check_proc_stopped':
platform/freebsd/freebsd.c:57: warning: 'state' may be used uninitialized in this function
--- platform/freebsd/freebsd.c.orig	2015-06-05 21:41:48 UTC
+++ platform/freebsd/freebsd.c
@@ -54,7 +54,7 @@ int check_pgroup(pid_t target) {
 int check_proc_stopped(pid_t pid, int fd) {
     struct procstat *procstat;
     struct kinfo_proc *kp;
-    int state;
+    int state = 0;
     unsigned int cnt;
 
     procstat = procstat_open_sysctl();

Return to bug 249994

Lines 1-36 Link Here

(-)sysutils/reptyr/files/patch-git_308f600 (-36 lines)
1	commit 308f60064fee6d5707514b65f6acad656a8a4feb
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Tue Feb 2 19:04:11 2016 +0100
4
5	FreeBSD: Do not try to cast NULL to int.
6
7	Passing NULL to the data parameter in calls to ptrace(2) causes failures
8	on 64-bit FreeBSD 9 installations, where GCC 4.2.1 complains like this:
9
10	platform/freebsd/arch/x86_common.h: In function 'arch_get_register':
11	platform/freebsd/arch/x86_common.h:48: warning: cast from pointer to integer of different size
12	platform/freebsd/arch/x86_common.h: In function 'arch_set_register':
13	platform/freebsd/arch/x86_common.h:57: warning: cast from pointer to integer of different size
14	platform/freebsd/arch/x86_common.h:59: warning: cast from pointer to integer of different size
15	platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_to_child':
16	platform/freebsd/freebsd_ptrace.c:267: warning: cast from pointer to integer of different size
17	platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_from_child':
18	platform/freebsd/freebsd_ptrace.c:282: warning: cast from pointer to integer of different size
19
20	Make ptrace_command pass 0 to _ptrace_command so that the final
21	expansion looks like this:
22	__ptrace_command((cld), (req), (void*)(addr), (int)(0))
23	instead of
24	__ptrace_command((cld), (req), (void)(addr), (int)(((void)0)))
25
26	--- platform/freebsd/freebsd_ptrace.c
27	+++ platform/freebsd/freebsd_ptrace.c
28	@@ -47,7 +47,7 @@
29	static int __ptrace_command(struct ptrace_child *child, int req,
30	void *, int);
31
32	-#define ptrace_command(cld, req, ...) _ptrace_command(cld, req, ## __VA_ARGS__, NULL, NULL)
33	+#define ptrace_command(cld, req, ...) _ptrace_command(cld, req, ## __VA_ARGS__, 0, 0)
34	#define _ptrace_command(cld, req, addr, data, ...) __ptrace_command((cld), (req), (void*)(addr), (int)(data))
35
36

Lines 1-16 Link Here

(-)sysutils/reptyr/files/patch-platform_freebsd_freebsd.c (-16 lines)
1	Fix the build on FreeBSD 9:
2
3	cc1: warnings being treated as errors
4	platform/freebsd/freebsd.c: In function 'check_proc_stopped':
5	platform/freebsd/freebsd.c:57: warning: 'state' may be used uninitialized in this function
6	--- platform/freebsd/freebsd.c.orig 2015-06-05 21:41:48 UTC
7	+++ platform/freebsd/freebsd.c
8	@@ -54,7 +54,7 @@ int check_pgroup(pid_t target) {
9	int check_proc_stopped(pid_t pid, int fd) {
10	struct procstat *procstat;
11	struct kinfo_proc *kp;
12	- int state;
13	+ int state = 0;
14	unsigned int cnt;
15
16	procstat = procstat_open_sysctl();