diff --git a/COPYING b/COPYING index d60c31a9..dcd427ae 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/Makefile b/Makefile index 16273a15..da6973c6 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,13 @@ # Set to 'yes' to include debugging information, e.g. DEBUG=yes make -e -DEBUG := no +DEBUG := yes PREFIX ?= /usr -LIBDIR ?= lib +ARCH := $(shell getconf LONG_BIT) +ifeq ($(ARCH),64) + LIBDIR := lib64 +else + LIBDIR := lib +endif # compiler/linker options CC := gcc @@ -43,11 +48,11 @@ TOOLS_SRC := tools # Conf CONFS := doc/pamusb.conf -CONFS_DEST := $(DESTDIR)/etc +CONFS_DEST := $(DESTDIR)/etc/security # Doc DOCS := doc/CONFIGURATION.md -DOCS_DEST := $(DESTDIR)$(PREFIX)/share/doc/pamusb +DOCS_DEST := $(DESTDIR)$(PREFIX)/share/doc/pam_usb # Man MANS := doc/pamusb-conf.1.gz doc/pamusb-agent.1.gz doc/pamusb-check.1.gz diff --git a/src/conf.c b/src/conf.c index 0d8f101c..5eda4110 100644 --- a/src/conf.c +++ b/src/conf.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/conf.h b/src/conf.h index c43f5987..e77171e9 100644 --- a/src/conf.h +++ b/src/conf.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_CONF_H_ diff --git a/src/device.c b/src/device.c index dfe9ae0b..05bdd391 100644 --- a/src/device.c +++ b/src/device.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/device.h b/src/device.h index e9a38512..793d0a04 100644 --- a/src/device.h +++ b/src/device.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_DEVICE_H_ diff --git a/src/hal.c b/src/hal.c index f9517927..c4c0357d 100644 --- a/src/hal.c +++ b/src/hal.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/hal.h b/src/hal.h index 78cbd0b9..930e91c9 100644 --- a/src/hal.h +++ b/src/hal.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_HAL_H_ diff --git a/src/local.c b/src/local.c index 8f3ce8d3..ffa2ec54 100644 --- a/src/local.c +++ b/src/local.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/local.h b/src/local.h index 1efb66c9..7de8beaf 100644 --- a/src/local.h +++ b/src/local.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_LOCAL_H_ diff --git a/src/log.c b/src/log.c index 1e99cc51..ed8da0ce 100644 --- a/src/log.c +++ b/src/log.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/log.h b/src/log.h index 7c779e8c..31994c5b 100644 --- a/src/log.h +++ b/src/log.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_LOG_H_ diff --git a/src/mem.c b/src/mem.c index e76f6662..dcc94e99 100644 --- a/src/mem.c +++ b/src/mem.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/mem.h b/src/mem.h index b5fbd0d9..1b69cd9c 100644 --- a/src/mem.h +++ b/src/mem.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_MEM_H_ diff --git a/src/pad.c b/src/pad.c index b1b54d17..7906ce5d 100644 --- a/src/pad.c +++ b/src/pad.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/pad.h b/src/pad.h index 6491c719..4c4fec81 100644 --- a/src/pad.h +++ b/src/pad.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_OTP_H_ diff --git a/src/pam.c b/src/pam.c index b68ac5af..38327707 100644 --- a/src/pam.c +++ b/src/pam.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #define PAM_SM_AUTH diff --git a/src/pamusb-check.c b/src/pamusb-check.c index 72a44da5..d2e0de31 100644 --- a/src/pamusb-check.c +++ b/src/pamusb-check.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/version.h b/src/version.h index 87d08a72..987825cd 100644 --- a/src/version.h +++ b/src/version.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_VERSION_H_ diff --git a/src/volume.c b/src/volume.c index c5a55e67..de703639 100644 --- a/src/volume.c +++ b/src/volume.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/volume.h b/src/volume.h index f7c2fe00..3055a005 100644 --- a/src/volume.h +++ b/src/volume.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef VOLUME_H_ diff --git a/src/xpath.c b/src/xpath.c index 9673bea5..1372106b 100644 --- a/src/xpath.c +++ b/src/xpath.c @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/xpath.h b/src/xpath.h index 1a74cbc1..6b6bcc50 100644 --- a/src/xpath.h +++ b/src/xpath.h @@ -11,8 +11,8 @@ * details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + * Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PUSB_XPATH_H_ diff --git a/tools/pamusb-agent b/tools/pamusb-agent index ffb6b3d4..faaf3187 100755 --- a/tools/pamusb-agent +++ b/tools/pamusb-agent @@ -12,8 +12,8 @@ # details. # # You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA +# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +# Street, Fifth Floor, Boston, MA 02110-1301 USA. import os import sys diff --git a/tools/pamusb-conf b/tools/pamusb-conf index 14cfe73f..b9fb82cd 100755 --- a/tools/pamusb-conf +++ b/tools/pamusb-conf @@ -12,8 +12,8 @@ # details. # # You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA +# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +# Street, Fifth Floor, Boston, MA 02110-1301 USA. import dbus