diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 3cd5b33e0f..8786c86b01 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -40,6 +40,8 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/ cp $PKG_DIR/scripts/apt-get $INSTALL/usr/bin/ ln -sf /bin/busybox $INSTALL/usr/bin/env #/usr/bin/env is needed for most python scripts + cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/ + ln -sf pastebinit $INSTALL/usr/bin/paste mkdir -p $INSTALL/sbin cp $PKG_DIR/scripts/init $INSTALL/sbin/ diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index bdbe49cd55..51f0927db7 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="bash kexec-tools hdparm speedcontrol pastebinit zip pciutils usbutils" +PKG_DEPENDS="bash kexec-tools hdparm speedcontrol zip pciutils usbutils" PKG_BUILD_DEPENDS="toolchain busybox-hosttools" PKG_PRIORITY="required" PKG_SECTION="system" diff --git a/packages/tools/pastebinit/install b/packages/sysutils/busybox/scripts/pastebinit similarity index 79% rename from packages/tools/pastebinit/install rename to packages/sysutils/busybox/scripts/pastebinit index 86d71f0964..94a09d1142 100755 --- a/packages/tools/pastebinit/install +++ b/packages/sysutils/busybox/scripts/pastebinit @@ -20,11 +20,9 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +# +# wrapper for curl, posting to the sprunge.us pastebin +# reads from stdin if called without an argument +# -mkdir -p $INSTALL/etc/pastebin.d - cp $PKG_BUILD/pastebin.d/sprunge.us.conf $INSTALL/etc/pastebin.d - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/pastebinit $INSTALL/usr/bin - ln -sf pastebinit $INSTALL/usr/bin/paste # link for a shorter command +cat "$@" | curl -F 'sprunge=<-' http://sprunge.us diff --git a/packages/tools/pastebinit/meta b/packages/tools/pastebinit/meta deleted file mode 100644 index a8d3a1f098..0000000000 --- a/packages/tools/pastebinit/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="pastebinit" -PKG_VERSION="1.3.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://launchpad.net/pastebinit" -PKG_URL="http://launchpad.net/pastebinit/trunk/$PKG_VERSION/+download/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python simplejson configobj" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="tools" -PKG_SHORTDESC="pastebinit: Upload Directly to Pastebin from the Linux Shell" -PKG_LONGDESC="pastebinit is a tool for Uploading Directly to Pastebin from the Linux Shell" -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/tools/pastebinit/patches/pastebinit-1.3.1-01-change_default_pastebin.patch b/packages/tools/pastebinit/patches/pastebinit-1.3.1-01-change_default_pastebin.patch deleted file mode 100644 index e64d5c9ab0..0000000000 --- a/packages/tools/pastebinit/patches/pastebinit-1.3.1-01-change_default_pastebin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pastebinit-1.3/pastebinit pastebinit-1.3.patch/pastebinit ---- pastebinit-1.3/pastebinit 2012-02-15 22:14:22.000000000 +0100 -+++ pastebinit-1.3.patch/pastebinit 2012-05-07 03:40:49.119612858 +0200 -@@ -17,7 +17,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --defaultPB = "http://pastebin.com" #Default pastebin -+defaultPB = "http://sprunge.us" #Default pastebin - try: - import lsb_release - release = lsb_release.get_distro_information()['ID'].lower()