summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-03-19 17:25:00 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-19 17:52:04 (UTC)
commit5ca0d6a85c438ea75dc2795aca5176e3b31e89f0 (patch) (side-by-side diff)
treef35c09c1d07c2150d4d0a58a517b878a44591cc8
parentc295320edf2d733a12a622c5a721c8431800a68a (diff)
downloadiii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.zip
iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.tar.gz
iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.tar.bz2
linting debian stuff
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/iii.postinst2
-rwxr-xr-xdebian/iii.postrm1
-rw-r--r--debian/source/format1
-rw-r--r--doc/000000000000.conf2
-rw-r--r--src/eyefiservice.cc1
8 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index d580f58..f79983e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,13 +9,13 @@ AC_PROG_CC
PKG_PROG_PKG_CONFIG
AC_HEADER_STDC
AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
-PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse])
+PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse])
PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
AM_CONDITIONAL([HAVE_UUID],[$have_uuid])
if $have_uuid ; then
AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid])
AC_SUBST([UUID_UUID],[uuid])
fi
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 02a6138..aaa8c78 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
Source: iii
Section: graphics
Priority: optional
Maintainer: Michael Krelin <hacker@klever.net>
Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
Package: iii
Architecture: any
-Depends: adduser, ${shlibs:Depends}
+Depends: adduser, ${shlibs:Depends}, ${misc:Depends}
Description: Eye-Fi Manager implementation
Implementation of Eye-Fi manager service for Linux
diff --git a/debian/iii.postinst b/debian/iii.postinst
index 20463a1..f52bf84 100755
--- a/debian/iii.postinst
+++ b/debian/iii.postinst
@@ -1,10 +1,10 @@
#!/bin/sh
set -e
UG=eyefi
-P=eyekindo
+P=iii
H=/var/lib/$P
if [ "$1" = configure ] ; then
getent group $UG >/dev/null 2>&1 || addgroup --system $UG
getent passwd $UG >/dev/null 2>&1 || adduser --system --home $H \
--no-create-home --disabled-password --ingroup $UG $UG
diff --git a/debian/iii.postrm b/debian/iii.postrm
index a2c66fa..6060c4f 100755
--- a/debian/iii.postrm
+++ b/debian/iii.postrm
@@ -1,3 +1,4 @@
#!/bin/sh
+set -e
#DEBHELPER#
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- a/dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/doc/000000000000.conf b/doc/000000000000.conf
index d7b365f..01f8fae 100644
--- a/doc/000000000000.conf
+++ b/doc/000000000000.conf
@@ -1,9 +1,9 @@
# target directory for uploaded files, if the name contains %s, it is replaced
# with eyefi card mac address.
-targetdir = "/var/lib/eyekindo/%s/"
+targetdir = "/var/lib/iii/%s/"
# the upload key as seen in Mac and (perhaps) windows Settings.xml file
uploadkey = "e3e2c4a305cee6bce0ebb38a3259ac08"
# commands to be executed at certain events, the commands also receive certain
# values of interested passed via environment.
# for on-start-session: EYEFI_MACADDRESS, EYEFI_TRANSFER_MODE, EYEFI_TRANSFERMODETIMESTAMP
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 49521e0..9650ec1 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -3,13 +3,12 @@
#include <fstream>
#include <stdexcept>
#include <iterator>
#include <syslog.h>
#include <sys/wait.h>
#include <autosprintf.h>
-#include <openssl/rand.h>
#include "eyekinfig.h"
#include "eyetil.h"
#include "soapeyefiService.h"
static binary_t session_nonce;