summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
author Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-29 07:17:07 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-29 07:20:13 +0700
commit712eac86bbfd1f8db42edb131793a5d1ace8554b (patch)
tree8a0561ed49d096c5c2dd6880f890858c88a10465 /misc
parent84bd8111d6920ae19355ccbb1f21574e60921834 (diff)
downloadslackbuilds-712eac86bbfd1f8db42edb131793a5d1ace8554b.tar.gz
slackbuilds-712eac86bbfd1f8db42edb131793a5d1ace8554b.tar.xz
misc/nixnote: Fix build and update dep.
Thanks to Duane Penzien for bug report. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/nixnote/nixnote.SlackBuild22
-rw-r--r--misc/nixnote/nixnote.info14
2 files changed, 20 insertions, 16 deletions
diff --git a/misc/nixnote/nixnote.SlackBuild b/misc/nixnote/nixnote.SlackBuild
index 4fc555450f..1639050f23 100644
--- a/misc/nixnote/nixnote.SlackBuild
+++ b/misc/nixnote/nixnote.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for nixnote
-# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2013-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
PRGNAM=nixnote
VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,11 +40,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SOURCEARCH="i386"
-elif [ "$ARCH" = "i686" ]; then
- SOURCEARCH="i386"
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
SOURCEARCH="amd64"
else
SOURCEARCH="i386"
@@ -60,14 +56,18 @@ tar xvf $CWD/$PRGNAM-${VERSION}_$SOURCEARCH.tar.gz
cd $PRGNAM
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
cp -r usr $PKG
rm -rf $PKG/usr/share/man
+# Use patched nixnote to remove SSLv3 usage
+# https://sourceforge.net/p/nevernote/support-requests/21/
+cp $CWD/nixnote.jar $PKG/usr/share/nixnote/
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/nixnote/nixnote.info b/misc/nixnote/nixnote.info
index 25e1d0f760..ff9503da25 100644
--- a/misc/nixnote/nixnote.info
+++ b/misc/nixnote/nixnote.info
@@ -1,10 +1,14 @@
PRGNAM="nixnote"
VERSION="1.6"
HOMEPAGE="http://nevernote.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/nevernote/files/NixNote%201.6/nixnote-1.6_i386.tar.gz"
-MD5SUM="d79e6dde6ec3acd3f973f8469746df25"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/nevernote/files/NixNote%201.6/nixnote-1.6_amd64.tar.gz"
-MD5SUM_x86_64="d3f98f571cc80155313b13e708f23e48"
-REQUIRES="jdk"
+DOWNLOAD="http://sourceforge.net/projects/nevernote/files/NixNote%201.6/nixnote-1.6_i386.tar.gz \
+ https://sourceforge.net/projects/nevernote/files/Unstable%20Patches%20-%201.6/nixnote.jar"
+MD5SUM="d79e6dde6ec3acd3f973f8469746df25 \
+ a57a9887d984161310cb089481687446"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/nevernote/files/NixNote%201.6/nixnote-1.6_amd64.tar.gz \
+ https://sourceforge.net/projects/nevernote/files/Unstable%20Patches%20-%201.6/nixnote.jar"
+MD5SUM_x86_64="d3f98f571cc80155313b13e708f23e48 \
+ a57a9887d984161310cb089481687446"
+REQUIRES="jdk libpng-legacy12"
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"