linting debian stuff

Signed-off-by: Michael Krelin <hacker@klever.net>

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
@@ -1,39 +1,39 @@
 AC_INIT([iii], [0.2], [iii-bugs@klever.net])
 AC_CONFIG_SRCDIR([src/iiid.cc])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_INSTALL
 AC_PROG_CXX
 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
 
 AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false])
 test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.])
 
 notfound=false
 AC_CHECK_HEADERS([archive.h],[
  AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true])
 ],[notfound=true])
 $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/])
 
 notfound=false
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADERS([autosprintf.h],[
  AC_CHECK_LIB([asprintf],[main],,[notfound=true])
 ],[notfound=true])
 $notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found])
 AC_LANG_POP([C++])
 
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,18 +1,18 @@
 #!/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
  if ! test -d $H ; then
   mkdir -p $H
   chown $UG:$UG $H
   chmod 2770 $H
  fi
 fi
 
 #DEBHELPER#
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,17 +1,17 @@
 # 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
 on-start-session = "bash /usr/local/lib/iii/on-start-session.bash"
 # for on-upload-photo: EYEFI_MACADDRESS, EYEFI_UPLOADED (uploaded file name)
 on-upload-photo = "bash /usr/local/lib/iii/on-upload-photo.bash"
 # for on-mark-last-photo-in-roll: EYEFI_MACADDRESS, EYEFI_MERGEDELTA
 on-mark-last-photo-in-roll = "bash /usr/local/lib/iii/on-mark-last-photo-in-roll.bash"
 
 # file mode creation mask
 umask = 002
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 49521e0..9650ec1 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -1,33 +1,32 @@
 #include <cassert>
 #include <iostream>
 #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;
 
 static bool detached_child() {
     pid_t p = fork();
     if(p<0) throw std::runtime_error("failed to fork()");
     if(!p) {
 	p = fork();
 	if(p<0) {
 	    syslog(LOG_ERR,"Failed to re-fork child process");
 	    _exit(-1);
 	}
 	if(!p) {
 	    setsid();
 	    for(int i=getdtablesize();i>=0;--i) close(i);
 	    int i=open("/dev/null",O_RDWR); assert(i==0);
 	    i = dup(i); assert(i==1);
 	    i = dup(i); assert(i==2);
 	    return true;
 	}
 	_exit(0);