Skip to content

Commit

Permalink
Change references from OSX to macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
raulsiles authored and radare committed Nov 15, 2017
1 parent ab84548 commit 08d9abe
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ tests:
fi
cd $(R2R) ; ${MAKE}

osx-sign:
$(MAKE) -C binr/radare2 osx-sign
macos-sign:
$(MAKE) -C binr/radare2 macos-sign

osx-sign-libs:
$(MAKE) -C binr/radare2 osx-sign-libs
macos-sign-libs:
$(MAKE) -C binr/radare2 macos-sign-libs

osx-pkg:
sys/osx-pkg.sh $(VERSION)
Expand Down
4 changes: 2 additions & 2 deletions binr/radare2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ios-sign iossign sign:
ios_sdk_sign:
-codesign -s- --entitlements radare2.xml radare2

osx-sign osxsign:
macos-sign macossign:
rm -f radare2
${CC} radare2.c ${CFLAGS} ${LDFLAGS} -o radare2 \
-sectcreate __TEXT __info_plist Info.plist \
Expand All @@ -57,7 +57,7 @@ osx-sign osxsign:
#sudo chmod g+s radare2
# sudo chmod 4755 radare2

osx-sign-libs:
macos-sign-libs:
for LIB in ${SIGN_LIBS} ; do \
echo Signing $$LIB ; \
codesign -f -s ${CERTID} $$LIB ; \
Expand Down
6 changes: 3 additions & 3 deletions doc/macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ After Mac OS X 10.6, binaries that need permissions to debug require to be signe

As said before, the signing process can also be done manually following the next process. First, you will need to sign the radare2 binary:

$ make -C binr/radare2 osxsign
$ make -C binr/radare2 macossign

But this is not enough. As long as r2 code is splitted into several libraries, you should sign every single dependency (libr*).

$ make -C binr/radare2 osx-sign-libs
$ make -C binr/radare2 macos-sign-libs

Another alternative is to build a static version of r2 and just sign it.

$ sys/static.sh
$ make -C binr/radare2 osxsign
$ make -C binr/radare2 macossign

You can verify that the binary is properly signed and verified by using the code signing utility:

Expand Down
4 changes: 2 additions & 2 deletions libr/debug/p/native/xnu/xnu_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,8 @@ task_t pid_to_task (int pid) {
(char *)MACH_ERROR_STRING (err));
}
eprintf ("You probably need to run as root or sign "
"the binary.\n Read doc/ios.md || doc/osx.md\n"
" make -C binr/radare2 ios-sign || osx-sign\n");
"the binary.\n Read doc/ios.md || doc/macos.md\n"
" make -C binr/radare2 ios-sign || macos-sign\n");
return 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions sys/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ unset DEPS
./configure ${CFGARG} --prefix=${PREFIX} || exit 1
${MAKE} -s -j${MAKE_JOBS} MAKE_JOBS=${MAKE_JOBS} || exit 1
if [ "`uname`" = Darwin ]; then
${MAKE} osx-sign osx-sign-libs CERTID="${CERTID}" || (
${MAKE} macos-sign macos-sign-libs CERTID="${CERTID}" || (
echo "CERTID not defined. If you want the bins signed to debug without root"
echo "follow the instructions described in doc/osx and run make osx-sign."
echo "follow the instructions described in doc/macos.md and run make macos-sign."
)
fi

0 comments on commit 08d9abe

Please sign in to comment.