From be12791331b9b64867b5aa4b13df88c1a2b7e2a1 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 25 Jan 2014 16:05:08 -0500 Subject: build-sys: merge libsystemd-id128 into libsystemd --- Makefile.am | 185 +++++++------------ src/compat-libs/.gitignore | 2 +- src/compat-libs/libsystemd-id128.pc.in | 18 ++ src/compat-libs/libsystemd-id128.sym | 21 +++ src/libsystemd-id128/.gitignore | 1 - src/libsystemd-id128/Makefile | 1 - src/libsystemd-id128/libsystemd-id128.pc.in | 18 -- src/libsystemd-id128/libsystemd-id128.sym | 21 --- src/libsystemd-id128/sd-id128.c | 234 ------------------------- src/libsystemd/libsystemd.sym | 7 + src/libsystemd/sd-id128/Makefile | 1 + src/libsystemd/sd-id128/libsystemd-id128.pc.in | 18 ++ src/libsystemd/sd-id128/sd-id128.c | 234 +++++++++++++++++++++++++ 13 files changed, 361 insertions(+), 400 deletions(-) create mode 100644 src/compat-libs/libsystemd-id128.pc.in create mode 100644 src/compat-libs/libsystemd-id128.sym delete mode 100644 src/libsystemd-id128/.gitignore delete mode 120000 src/libsystemd-id128/Makefile delete mode 100644 src/libsystemd-id128/libsystemd-id128.pc.in delete mode 100644 src/libsystemd-id128/libsystemd-id128.sym delete mode 100644 src/libsystemd-id128/sd-id128.c create mode 120000 src/libsystemd/sd-id128/Makefile create mode 100644 src/libsystemd/sd-id128/libsystemd-id128.pc.in create mode 100644 src/libsystemd/sd-id128/sd-id128.c diff --git a/Makefile.am b/Makefile.am index 769d24a90a..37073d23a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,7 @@ LIBSYSTEMD_DAEMON_REVISION=10 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=26 +LIBSYSTEMD_ID128_REVISION=27 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=11 @@ -999,7 +999,6 @@ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libudev-internal.la \ libsystemd-shared.la \ @@ -1373,7 +1372,7 @@ test_strv_SOURCES = \ test_strv_LDADD = \ libsystemd-units.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la test_path_util_SOURCES = \ @@ -1394,7 +1393,7 @@ test_install_SOURCES = \ test_install_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la test_watchdog_SOURCES = \ @@ -1458,7 +1457,6 @@ systemd_analyze_SOURCES = \ systemd_analyze_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1468,7 +1466,6 @@ systemd_initctl_SOURCES = \ systemd_initctl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1482,7 +1479,6 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(AUDIT_LIBS) @@ -1558,7 +1554,7 @@ systemd_tmpfiles_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la rootbin_PROGRAMS += \ @@ -1611,7 +1607,7 @@ systemd_machine_id_setup_SOURCES = \ systemd_machine_id_setup_LDADD = \ libsystemd-label.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1634,7 +1630,6 @@ systemd_fsck_SOURCES = \ systemd_fsck_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -1714,7 +1709,7 @@ bootctl_SOURCES = \ bootctl_LDADD = \ libsystemd-shared.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la bin_PROGRAMS += \ @@ -1735,7 +1730,7 @@ systemd_gpt_auto_generator_SOURCES = \ systemd_gpt_auto_generator_LDADD = \ libsystemd-label.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) @@ -1792,7 +1787,6 @@ systemd_cgroups_agent_SOURCES = \ systemd_cgroups_agent_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1806,7 +1800,6 @@ systemctl_LDADD = \ libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1860,7 +1853,6 @@ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1873,7 +1865,6 @@ systemd_run_LDADD = \ libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1883,7 +1874,6 @@ systemd_bus_proxyd_SOURCES = \ systemd_bus_proxyd_LDADD = \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la bus-proxyd-install-hook: @@ -1980,6 +1970,7 @@ libsystemd_la_SOURCES = \ src/systemd/sd-rtnl.h \ src/systemd/sd-resolve.h \ src/systemd/sd-login.h \ + src/systemd/sd-id128.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2027,6 +2018,7 @@ libsystemd_la_SOURCES = \ src/libsystemd/sd-rtnl/rtnl-util.c \ src/libsystemd/sd-resolve/sd-resolve.c \ src/libsystemd/sd-resolve/resolve-util.h \ + src/libsystemd/sd-id128/sd-id128.c \ src/login/sd-login.c \ src/login/login-shared.c \ src/login/login-shared.h @@ -2035,7 +2027,6 @@ nodist_libsystemd_la_SOURCES = \ src/libsystemd/sd-bus/bus-error-mapping.c libsystemd_la_LIBADD = \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2052,6 +2043,10 @@ libsystemd_la_LDFLAGS = \ pkgconfiglib_DATA += \ src/libsystemd/libsystemd.pc +pkginclude_HEADERS += \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h + EXTRA_DIST += \ src/libsystemd/sd-bus/bus-error-mapping.gperf \ src/libsystemd/sd-bus/DIFFERENCES \ @@ -2116,7 +2111,6 @@ test_bus_marshal_SOURCES = \ test_bus_marshal_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2147,7 +2141,6 @@ test_bus_chat_CFLAGS = \ test_bus_chat_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2156,7 +2149,6 @@ test_bus_cleanup_SOURCES = \ test_bus_cleanup_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2169,7 +2161,6 @@ test_bus_server_CFLAGS = \ test_bus_server_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2183,7 +2174,6 @@ test_bus_objects_CFLAGS = \ test_bus_objects_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2195,7 +2185,6 @@ test_bus_error_SOURCES = \ test_bus_error_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2204,7 +2193,6 @@ test_bus_gvariant_SOURCES = \ test_bus_gvariant_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2222,7 +2210,6 @@ test_bus_creds_SOURCES = \ test_bus_creds_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2233,7 +2220,6 @@ test_bus_match_SOURCES = \ test_bus_match_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2242,7 +2228,6 @@ test_bus_kernel_SOURCES = \ test_bus_kernel_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2258,7 +2243,6 @@ test_bus_kernel_bloom_SOURCES = \ test_bus_kernel_bloom_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2267,7 +2251,6 @@ test_bus_kernel_benchmark_SOURCES = \ test_bus_kernel_benchmark_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2283,7 +2266,6 @@ test_bus_zero_copy_SOURCES = \ test_bus_zero_copy_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2306,7 +2288,6 @@ test_event_SOURCES = \ test_event_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2316,7 +2297,6 @@ test_rtnl_SOURCES = \ test_rtnl_LDADD = \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la test_resolve_SOURCES = \ @@ -2336,7 +2316,6 @@ busctl_SOURCES = \ busctl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2383,7 +2362,6 @@ test_dhcp_client_LDADD = \ libsystemd-dhcp.la \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la tests += \ @@ -2430,7 +2408,6 @@ libudev_la_LDFLAGS = \ libudev_la_LIBADD = \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la pkgconfiglib_DATA += \ @@ -2615,7 +2592,6 @@ libudev_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2987,62 +2963,17 @@ udevlibexec_PROGRAMS += \ mtd_probe # ------------------------------------------------------------------------------ -libsystemd_id128_la_SOURCES = \ - src/libsystemd-id128/libsystemd-id128.sym \ - src/libsystemd-id128/sd-id128.c - -libsystemd_id128_la_CFLAGS = \ - $(AM_CFLAGS) \ - -fvisibility=hidden - -libsystemd_id128_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym - -libsystemd_id128_la_LIBADD = \ - libsystemd-daemon-internal.la \ - libsystemd-shared.la - -libsystemd_id128_internal_la_SOURCES = \ - $(libsystemd_id128_la_SOURCES) - test_id128_SOURCES = \ src/test/test-id128.c test_id128_LDADD = \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la tests += \ test-id128 -pkginclude_HEADERS += \ - src/systemd/sd-id128.h - -lib_LTLIBRARIES += \ - libsystemd-id128.la - -noinst_LTLIBRARIES += \ - libsystemd-id128-internal.la - -pkgconfiglib_DATA += \ - src/libsystemd-id128/libsystemd-id128.pc - -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -libsystemd-id128-install-hook: - libname=libsystemd-id128.so && $(move-to-rootlibdir) - -libsystemd-id128-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* - -INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook -UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook - -EXTRA_DIST += \ - src/libsystemd-id128/libsystemd-id128.pc.in - # ------------------------------------------------------------------------------ rootlibexec_PROGRAMS += \ @@ -3081,7 +3012,7 @@ journalctl_SOURCES = \ journalctl_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-shared.la @@ -3211,7 +3142,7 @@ libsystemd_journal_la_LDFLAGS = \ libsystemd_journal_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la libsystemd_journal_internal_la_SOURCES = \ @@ -3266,7 +3197,7 @@ libsystemd_journal_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la if HAVE_ACL @@ -3417,7 +3348,6 @@ systemd_journal_gatewayd_SOURCES = \ systemd_journal_gatewayd_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ libsystemd-shared.la \ @@ -3454,7 +3384,6 @@ systemd_socket_proxyd_LDADD = \ libsystemd-logs.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3477,7 +3406,7 @@ systemd_coredumpctl_SOURCES = \ systemd_coredumpctl_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la bin_PROGRAMS += \ @@ -3738,7 +3667,6 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3771,7 +3699,6 @@ hostnamectl_SOURCES = \ hostnamectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3799,7 +3726,6 @@ systemd_bus_driverd_SOURCES = \ systemd_bus_driverd_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3837,7 +3763,6 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3879,7 +3804,6 @@ localectl_SOURCES = \ localectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3908,7 +3832,6 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3945,7 +3868,6 @@ timedatectl_SOURCES = \ timedatectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4006,7 +3928,6 @@ libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -4018,7 +3939,6 @@ machinectl_SOURCES = \ machinectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4084,7 +4004,6 @@ systemd_networkd_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ libsystemd-dhcp.la \ - libsystemd-id128-internal.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4109,7 +4028,6 @@ test_network_LDADD = \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-dhcp.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4167,7 +4085,6 @@ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -4201,7 +4118,6 @@ loginctl_LDADD = \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la rootbin_PROGRAMS += \ @@ -4219,7 +4135,6 @@ systemd_inhibit_SOURCES = \ systemd_inhibit_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4246,7 +4161,6 @@ test_inhibit_SOURCES = \ test_inhibit_LDADD = \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la test_login_tables_SOURCES = \ @@ -4283,7 +4197,6 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-capability.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(PAM_LIBS) @@ -4312,9 +4225,6 @@ dist_dbuspolicy_DATA += \ dist_pkgsysconf_DATA += \ src/login/logind.conf -pkginclude_HEADERS += \ - src/systemd/sd-login.h - polkitpolicy_files += \ src/login/org.freedesktop.login1.policy @@ -4364,7 +4274,6 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ src/login/logind-gperf.gperf \ - src/compat-libs/libsystemd-login.pc.in \ src/login/71-seat.rules.in \ src/login/73-seat-late.rules.in \ units/systemd-logind.service.in \ @@ -4417,7 +4326,7 @@ id128_la_LDFLAGS = \ id128_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd-id128.la + libsystemd.la _daemon_la_SOURCES = \ src/python-systemd/_daemon.c \ @@ -4459,7 +4368,7 @@ _reader_la_LDFLAGS = \ _reader_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ libsystemd-journal.la \ - libsystemd-id128.la \ + libsystemd.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4552,30 +4461,56 @@ libsystemd_login_la_LDFLAGS = \ libsystemd_login_la_LIBADD = \ libsystemd.la +libsystemd_id128_la_SOURCES = \ + libsystemd-id128.c \ + src/compat-libs/libsystemd-id128.sym + +libsystemd_id128_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + -imacros $(top_srcdir)/src/compat-libs/linkwarning.h + +libsystemd_id128_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym + +libsystemd_id128_la_LIBADD = \ + libsystemd.la + BUILT_SOURCES += \ - libsystemd-login.c + libsystemd-login.c \ + libsystemd-id128.c -libsystemd-login.c: src/compat-libs/libsystemd-login.sym +libsystemd-%.c: src/compat-libs/libsystemd-%.sym $(generate-fake-lib) lib_LTLIBRARIES += \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-id128.la pkgconfiglib_DATA += \ - src/compat-libs/libsystemd-login.pc + src/compat-libs/libsystemd-login.pc \ + src/compat-libs/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -libsystemd-login-install-hook: +compat-lib-install-hook: libname=libsystemd-login.so && $(move-to-rootlibdir) + libname=libsystemd-id128.so && $(move-to-rootlibdir) -libsystemd-login-uninstall-hook: +compat-lib-uninstall-hook: rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so* + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* -INSTALL_EXEC_HOOKS += libsystemd-login-install-hook -UNINSTALL_EXEC_HOOKS += libsystemd-login-uninstall-hook +INSTALL_EXEC_HOOKS += compat-lib-install-hook +UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook endif +EXTRA_DIST += \ + src/compat-libs/libsystemd-login.pc.in \ + src/compat-libs/libsystemd-id128.pc.in + # ------------------------------------------------------------------------------ substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ @@ -5002,7 +4937,7 @@ test-libsystemd-daemon-sym.c: \ $(generate-sym-test) test-libsystemd-id128-sym.c: \ - src/libsystemd-id128/libsystemd-id128.sym \ + src/compat-libs/libsystemd-id128.sym \ src/systemd/sd-id128.h $(generate-sym-test) @@ -5054,21 +4989,23 @@ test_libudev_sym_LDADD = \ BUILT_SOURCES += \ $(test_libsystemd_sym_SOURCES) \ $(test_libsystemd_daemon_sym_SOURCES) \ - $(test_libsystemd_id128_sym_SOURCES) \ $(test_libsystemd_journal_sym_SOURCES) \ - $(test_libsystemd_login_sym_SOURCES) \ $(test_libudev_sym_SOURCES) tests += \ test-libsystemd-sym \ test-libsystemd-daemon-sym \ - test-libsystemd-id128-sym \ test-libsystemd-journal-sym \ test-libudev-sym if ENABLE_COMPAT_LIBS +BUILT_SOURCES += \ + $(test_libsystemd_login_sym_SOURCES) \ + $(test_libsystemd_id128_sym_SOURCES) + tests += \ - test-libsystemd-login-sym + test-libsystemd-login-sym \ + test-libsystemd-id128-sym endif cppcheck: diff --git a/src/compat-libs/.gitignore b/src/compat-libs/.gitignore index 0b8d1067d9..662c154cdd 100644 --- a/src/compat-libs/.gitignore +++ b/src/compat-libs/.gitignore @@ -1 +1 @@ -/libsystemd-login.pc +/libsystemd-*.pc diff --git a/src/compat-libs/libsystemd-id128.pc.in b/src/compat-libs/libsystemd-id128.pc.in new file mode 100644 index 0000000000..bb65ffde33 --- /dev/null +++ b/src/compat-libs/libsystemd-id128.pc.in @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: systemd +Description: systemd 128 Bit ID Utility Library +URL: @PACKAGE_URL@ +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lsystemd-id128 +Cflags: -I${includedir} diff --git a/src/compat-libs/libsystemd-id128.sym b/src/compat-libs/libsystemd-id128.sym new file mode 100644 index 0000000000..604c0026c6 --- /dev/null +++ b/src/compat-libs/libsystemd-id128.sym @@ -0,0 +1,21 @@ +/*** + This file is part of systemd. + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. +***/ + +/* Original symbols from systemd v38 */ + +LIBSYSTEMD_ID128_38 { +global: + sd_id128_to_string; + sd_id128_from_string; + sd_id128_randomize; + sd_id128_get_machine; + sd_id128_get_boot; +local: + *; +}; diff --git a/src/libsystemd-id128/.gitignore b/src/libsystemd-id128/.gitignore deleted file mode 100644 index 144adf9bea..0000000000 --- a/src/libsystemd-id128/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/libsystemd-id128.pc diff --git a/src/libsystemd-id128/Makefile b/src/libsystemd-id128/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libsystemd-id128/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/libsystemd-id128/libsystemd-id128.pc.in b/src/libsystemd-id128/libsystemd-id128.pc.in deleted file mode 100644 index bb65ffde33..0000000000 --- a/src/libsystemd-id128/libsystemd-id128.pc.in +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: systemd -Description: systemd 128 Bit ID Utility Library -URL: @PACKAGE_URL@ -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lsystemd-id128 -Cflags: -I${includedir} diff --git a/src/libsystemd-id128/libsystemd-id128.sym b/src/libsystemd-id128/libsystemd-id128.sym deleted file mode 100644 index 604c0026c6..0000000000 --- a/src/libsystemd-id128/libsystemd-id128.sym +++ /dev/null @@ -1,21 +0,0 @@ -/*** - This file is part of systemd. - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. -***/ - -/* Original symbols from systemd v38 */ - -LIBSYSTEMD_ID128_38 { -global: - sd_id128_to_string; - sd_id128_from_string; - sd_id128_randomize; - sd_id128_get_machine; - sd_id128_get_boot; -local: - *; -}; diff --git a/src/libsystemd-id128/sd-id128.c b/src/libsystemd-id128/sd-id128.c deleted file mode 100644 index 9ee40ab91e..0000000000 --- a/src/libsystemd-id128/sd-id128.c +++ /dev/null @@ -1,234 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2011 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include - -#include "util.h" -#include "macro.h" -#include "sd-id128.h" - -_public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) { - unsigned n; - - assert_return(s, NULL); - - for (n = 0; n < 16; n++) { - s[n*2] = hexchar(id.bytes[n] >> 4); - s[n*2+1] = hexchar(id.bytes[n] & 0xF); - } - - s[32] = 0; - - return s; -} - -_public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) { - unsigned n, i; - sd_id128_t t; - bool is_guid = false; - - assert_return(s, -EINVAL); - assert_return(ret, -EINVAL); - - for (n = 0, i = 0; n < 16;) { - int a, b; - - if (s[i] == '-') { - /* Is this a GUID? Then be nice, and skip over - * the dashes */ - - if (i == 8) - is_guid = true; - else if (i == 13 || i == 18 || i == 23) { - if (!is_guid) - return -EINVAL; - } else - return -EINVAL; - - i++; - continue; - } - - a = unhexchar(s[i++]); - if (a < 0) - return -EINVAL; - - b = unhexchar(s[i++]); - if (b < 0) - return -EINVAL; - - t.bytes[n++] = (a << 4) | b; - } - - if (i != (is_guid ? 36 : 32)) - return -EINVAL; - - if (s[i] != 0) - return -EINVAL; - - *ret = t; - return 0; -} - -static sd_id128_t make_v4_uuid(sd_id128_t id) { - /* Stolen from generate_random_uuid() of drivers/char/random.c - * in the kernel sources */ - - /* Set UUID version to 4 --- truly random generation */ - id.bytes[6] = (id.bytes[6] & 0x0F) | 0x40; - - /* Set the UUID variant to DCE */ - id.bytes[8] = (id.bytes[8] & 0x3F) | 0x80; - - return id; -} - -_public_ int sd_id128_get_machine(sd_id128_t *ret) { - static thread_local sd_id128_t saved_machine_id; - static thread_local bool saved_machine_id_valid = false; - _cleanup_close_ int fd = -1; - char buf[33]; - ssize_t k; - unsigned j; - sd_id128_t t; - - assert_return(ret, -EINVAL); - - if (saved_machine_id_valid) { - *ret = saved_machine_id; - return 0; - } - - fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (fd < 0) - return -errno; - - k = loop_read(fd, buf, 33, false); - if (k < 0) - return (int) k; - - if (k != 33) - return -EIO; - - if (buf[32] !='\n') - return -EIO; - - for (j = 0; j < 16; j++) { - int a, b; - - a = unhexchar(buf[j*2]); - b = unhexchar(buf[j*2+1]); - - if (a < 0 || b < 0) - return -EIO; - - t.bytes[j] = a << 4 | b; - } - - saved_machine_id = t; - saved_machine_id_valid = true; - - *ret = t; - return 0; -} - -_public_ int sd_id128_get_boot(sd_id128_t *ret) { - static thread_local sd_id128_t saved_boot_id; - static thread_local bool saved_boot_id_valid = false; - _cleanup_close_ int fd = -1; - char buf[36]; - ssize_t k; - unsigned j; - sd_id128_t t; - char *p; - - assert_return(ret, -EINVAL); - - if (saved_boot_id_valid) { - *ret = saved_boot_id; - return 0; - } - - fd = open("/proc/sys/kernel/random/boot_id", O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (fd < 0) - return -errno; - - k = loop_read(fd, buf, 36, false); - if (k < 0) - return (int) k; - - if (k != 36) - return -EIO; - - for (j = 0, p = buf; j < 16; j++) { - int a, b; - - if (p >= buf + k) - return -EIO; - - if (*p == '-') - p++; - - a = unhexchar(p[0]); - b = unhexchar(p[1]); - - if (a < 0 || b < 0) - return -EIO; - - t.bytes[j] = a << 4 | b; - - p += 2; - } - - saved_boot_id = t; - saved_boot_id_valid = true; - - *ret = t; - return 0; -} - -_public_ int sd_id128_randomize(sd_id128_t *ret) { - _cleanup_close_ int fd = -1; - sd_id128_t t; - ssize_t k; - - assert_return(ret, -EINVAL); - - fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (fd < 0) - return -errno; - - k = loop_read(fd, &t, 16, false); - if (k < 0) - return (int) k; - - if (k != 16) - return -EIO; - - /* Turn this into a valid v4 UUID, to be nice. Note that we - * only guarantee this for newly generated UUIDs, not for - * pre-existing ones.*/ - - *ret = make_v4_uuid(t); - return 0; -} diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index 9b10604b53..9416f223e2 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -10,6 +10,13 @@ LIBSYSTEMD_209 { global: + /* originally LIBSYSTEMD_ID128_38 */ + sd_id128_to_string; + sd_id128_from_string; + sd_id128_randomize; + sd_id128_get_machine; + sd_id128_get_boot; + /* originally LIBSYSTEMD_LOGIN_31 */ sd_get_seats; sd_get_sessions; diff --git a/src/libsystemd/sd-id128/Makefile b/src/libsystemd/sd-id128/Makefile new file mode 120000 index 0000000000..94aaae2c4d --- /dev/null +++ b/src/libsystemd/sd-id128/Makefile @@ -0,0 +1 @@ +../../Makefile \ No newline at end of file diff --git a/src/libsystemd/sd-id128/libsystemd-id128.pc.in b/src/libsystemd/sd-id128/libsystemd-id128.pc.in new file mode 100644 index 0000000000..bb65ffde33 --- /dev/null +++ b/src/libsystemd/sd-id128/libsystemd-id128.pc.in @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: systemd +Description: systemd 128 Bit ID Utility Library +URL: @PACKAGE_URL@ +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lsystemd-id128 +Cflags: -I${includedir} diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c new file mode 100644 index 0000000000..9ee40ab91e --- /dev/null +++ b/src/libsystemd/sd-id128/sd-id128.c @@ -0,0 +1,234 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2011 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include + +#include "util.h" +#include "macro.h" +#include "sd-id128.h" + +_public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) { + unsigned n; + + assert_return(s, NULL); + + for (n = 0; n < 16; n++) { + s[n*2] = hexchar(id.bytes[n] >> 4); + s[n*2+1] = hexchar(id.bytes[n] & 0xF); + } + + s[32] = 0; + + return s; +} + +_public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) { + unsigned n, i; + sd_id128_t t; + bool is_guid = false; + + assert_return(s, -EINVAL); + assert_return(ret, -EINVAL); + + for (n = 0, i = 0; n < 16;) { + int a, b; + + if (s[i] == '-') { + /* Is this a GUID? Then be nice, and skip over + * the dashes */ + + if (i == 8) + is_guid = true; + else if (i == 13 || i == 18 || i == 23) { + if (!is_guid) + return -EINVAL; + } else + return -EINVAL; + + i++; + continue; + } + + a = unhexchar(s[i++]); + if (a < 0) + return -EINVAL; + + b = unhexchar(s[i++]); + if (b < 0) + return -EINVAL; + + t.bytes[n++] = (a << 4) | b; + } + + if (i != (is_guid ? 36 : 32)) + return -EINVAL; + + if (s[i] != 0) + return -EINVAL; + + *ret = t; + return 0; +} + +static sd_id128_t make_v4_uuid(sd_id128_t id) { + /* Stolen from generate_random_uuid() of drivers/char/random.c + * in the kernel sources */ + + /* Set UUID version to 4 --- truly random generation */ + id.bytes[6] = (id.bytes[6] & 0x0F) | 0x40; + + /* Set the UUID variant to DCE */ + id.bytes[8] = (id.bytes[8] & 0x3F) | 0x80; + + return id; +} + +_public_ int sd_id128_get_machine(sd_id128_t *ret) { + static thread_local sd_id128_t saved_machine_id; + static thread_local bool saved_machine_id_valid = false; + _cleanup_close_ int fd = -1; + char buf[33]; + ssize_t k; + unsigned j; + sd_id128_t t; + + assert_return(ret, -EINVAL); + + if (saved_machine_id_valid) { + *ret = saved_machine_id; + return 0; + } + + fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd < 0) + return -errno; + + k = loop_read(fd, buf, 33, false); + if (k < 0) + return (int) k; + + if (k != 33) + return -EIO; + + if (buf[32] !='\n') + return -EIO; + + for (j = 0; j < 16; j++) { + int a, b; + + a = unhexchar(buf[j*2]); + b = unhexchar(buf[j*2+1]); + + if (a < 0 || b < 0) + return -EIO; + + t.bytes[j] = a << 4 | b; + } + + saved_machine_id = t; + saved_machine_id_valid = true; + + *ret = t; + return 0; +} + +_public_ int sd_id128_get_boot(sd_id128_t *ret) { + static thread_local sd_id128_t saved_boot_id; + static thread_local bool saved_boot_id_valid = false; + _cleanup_close_ int fd = -1; + char buf[36]; + ssize_t k; + unsigned j; + sd_id128_t t; + char *p; + + assert_return(ret, -EINVAL); + + if (saved_boot_id_valid) { + *ret = saved_boot_id; + return 0; + } + + fd = open("/proc/sys/kernel/random/boot_id", O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd < 0) + return -errno; + + k = loop_read(fd, buf, 36, false); + if (k < 0) + return (int) k; + + if (k != 36) + return -EIO; + + for (j = 0, p = buf; j < 16; j++) { + int a, b; + + if (p >= buf + k) + return -EIO; + + if (*p == '-') + p++; + + a = unhexchar(p[0]); + b = unhexchar(p[1]); + + if (a < 0 || b < 0) + return -EIO; + + t.bytes[j] = a << 4 | b; + + p += 2; + } + + saved_boot_id = t; + saved_boot_id_valid = true; + + *ret = t; + return 0; +} + +_public_ int sd_id128_randomize(sd_id128_t *ret) { + _cleanup_close_ int fd = -1; + sd_id128_t t; + ssize_t k; + + assert_return(ret, -EINVAL); + + fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd < 0) + return -errno; + + k = loop_read(fd, &t, 16, false); + if (k < 0) + return (int) k; + + if (k != 16) + return -EIO; + + /* Turn this into a valid v4 UUID, to be nice. Note that we + * only guarantee this for newly generated UUIDs, not for + * pre-existing ones.*/ + + *ret = make_v4_uuid(t); + return 0; +} -- cgit v1.2.3-54-g00ecf